codex-storage
/
das-research
mirror of https://github.com/codex-storage/das-research.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

WIP restricted neighborhood 

Signed-off-by: Csaba Kiraly <csaba.kiraly@gmail.com>
This commit is contained in:
Csaba Kiraly 2024-03-05 11:55:23 +01:00
parent 1bc1256578
commit f127545eaf
No known key found for this signature in database
GPG Key ID: 0FE274EE8C95166E
2 changed files with 73 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
DAS/node.py
View File

@ -15,6 +15,8 @@ class P2PNeighbor:
self.node = node
def setPeer(self, peer):
self.peer = peer
def getNode(self):
return self.node
class Neighbor:
"""This class implements a node neighbor to monitor sent and received data.
@ -40,6 +42,11 @@ class Neighbor:
def setPeer(self, peer):
self.peer = peer
def getNode(self):
return self.node
def getPeerNode(self):
return self.peer.node
class Validator:
def __init__(self, rowIDs, columnIDs):
@ -139,6 +146,12 @@ class Node:
if self.ID not in peer.neighbors:
peer.neighbors[self.ID] = n
def getRowNeighbors(self, id):
return self.rowNeighbors[id]
def getColumnNeighbors(self, id):
return self.columnNeighbors[id]
def addRowNeighbor(self, lineID, peer, symmetric = True):
n = Neighbor(self, 0, self.shape.blockSizeR)
p = Neighbor(peer, 0, self.shape.blockSizeR)

77
DAS/simulator.py
View File

@ -126,30 +126,71 @@ class Simulator:
rowChannels = [[] for i in range(self.shape.blockSizeC)]
columnChannels = [[] for i in range(self.shape.blockSizeR)]
def initGS(id, interestedNodes, degree, addNeighbor, roc):
def initP2PNeigborhood(nodes, degree):
if (len(nodes) <= degree + 1):
self.logger.debug("Graph fully connected with degree %d !" % (len(nodes) - 1), extra=self.format)
G = nx.complete_graph(len(nodes))
else:
G = nx.random_regular_graph(degree, len(nodes))
if not nx.is_connected(G):
self.logger.error("Graph not connected!", extra=self.format)
for u, v in G.edges:
val1=nodes[u]
val2=nodes[v]
val1.addNeighbor(val2, symmetric=True) # symmetric
def initGS(id, interestedNodes, degree, addNeighbor, getNeighbors, roc):
nodes = interestedNodes.copy()
while nodes:
done = set()
for node in nodes:
neighs = set(map(P2PNeighbor.getNode, node.neighbors.values()))
gsNeighs = set(map(Neighbor.getPeerNode, getNeighbors(node, id).values()))
if len(gsNeighs) < degree:
#newNeighs = neighs.intersection(nodes).difference(done).difference(gsNeighs)
newNeighs = neighs.intersection(nodes)
newNeighs = neighs.intersection(nodes).difference(done)
newNeighs = neighs.intersection(nodes).difference(done).difference(gsNeighs)
if newNeighs:
n = random.choice(list(newNeighs))
addNeighbor(node, id, n) # symmetric
self.logger.debug("adding %d %d (%d)" % (node.ID, n.ID, len(gsNeighs)), extra=self.format)
if len(getNeighbors(node, id)) >= degree:
done.add(node)
if len(getNeighbors(node, id)) >= degree:
done.add(n)
else:
done.add(node)
self.logger.debug("No more potential neighbors for %d, row %d (%d)" % (node.ID, id, len(gsNeighs)), extra=self.format)
else:
done.add(node)
self.logger.debug("Neighbors for %d, row %d (%d)" % (node.ID, id, len(gsNeighs)), extra=self.format)
#nodes = list(filter(lambda n : len(n.getRowNeighbors(id)) < degree, nodes))
nodes = list(set(nodes).difference(done))
# If the number of nodes in a channel is smaller or equal to the
# requested degree, a fully connected graph is used. For n>d, a random
# d-regular graph is set up. (For n=d+1, the two are the same.)
if not interestedNodes:
self.logger.error("No nodes for %s %d !" % (roc, id), extra=self.format)
return
elif (len(interestedNodes) <= degree):
self.logger.debug("Graph fully connected with degree %d !" % (len(interestedNodes) - 1), extra=self.format)
G = nx.complete_graph(len(interestedNodes))
else:
G = nx.random_regular_graph(degree, len(interestedNodes))
if not nx.is_connected(G):
self.logger.error("Graph not connected for %s %d !" % (roc, id), extra=self.format)
for u, v in G.edges:
val1=interestedNodes[u]
val2=interestedNodes[v]
addNeighbor(val1, id, val2) # symmetric
# if not interestedNodes:
# self.logger.error("No nodes for %s %d !" % (roc, id), extra=self.format)
# return
# elif (len(interestedNodes) <= degree):
# self.logger.debug("Graph fully connected with degree %d !" % (len(interestedNodes) - 1), extra=self.format)
# G = nx.complete_graph(len(interestedNodes))
# else:
# G = nx.random_regular_graph(degree, len(interestedNodes))
# if not nx.is_connected(G):
# self.logger.error("Graph not connected for %s %d !" % (roc, id), extra=self.format)
# for u, v in G.edges:
# val1=interestedNodes[u]
# val2=interestedNodes[v]
# addNeighbor(val1, id, val2) # symmetric
def initRowGS(id):
initGS(id, rowChannels[id], self.shape.netDegree, Node.addRowNeighbor, "row")
initGS(id, rowChannels[id], self.shape.netDegree, Node.addRowNeighbor, Node.getRowNeighbors, "row")
def initColumnGS(id):
initGS(id, columnChannels[id], self.shape.netDegree, Node.addColumnNeighbor, "column")
initGS(id, columnChannels[id], self.shape.netDegree, Node.addColumnNeighbor, Node.getColumnNeighbors, "column")
for v in self.validators:
if not (self.proposerPublishOnly and v.amIproposer):
@ -166,6 +207,8 @@ class Simulator:
self.logger.debug("Number of validators per row; Min: %d, Max: %d" % (min(self.distR), max(self.distR)), extra=self.format)
self.logger.debug("Number of validators per column; Min: %d, Max: %d" % (min(self.distC), max(self.distC)), extra=self.format)
initP2PNeigborhood(self.validators, 50)#len(self.validators) - 1)
#set up GS for nodes
for id in range(self.shape.blockSizeC):
initRowGS(id)