WIP [ci skip]

MatrixAI · Nov 9, 2023 · 108d3a7 · 108d3a7
1 parent f2ff265
commit 108d3a7
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 11 deletions.
diff --git a/src/nodes/NodeGraph.ts b/src/nodes/NodeGraph.ts
@@ -274,11 +274,12 @@ class NodeGraph {
   public async setNode(
     nodeId: NodeId,
     nodeAddress: NodeAddress,
+    lastUpdated: number = utils.getUnixtime(),
     tran?: DBTransaction,
   ): Promise<void> {
     if (tran == null) {
       return this.db.withTransactionF((tran) =>
-        this.setNode(nodeId, nodeAddress, tran),
+        this.setNode(nodeId, nodeAddress, lastUpdated, tran),
       );
     }
     const [bucketIndex, bucketKey] = this.bucketIndex(nodeId);
@@ -298,7 +299,6 @@ class NodeGraph {
       }
       await this.setBucketMetaProp(bucketIndex, 'count', count + 1, tran);
     }
-    const lastUpdated = utils.getUnixtime();
     await tran.put(bucketPath, {
       address: nodeAddress,
       lastUpdated,

diff --git a/src/nodes/NodeManager.ts b/src/nodes/NodeManager.ts
@@ -760,7 +760,7 @@ class NodeManager {
     if (nodeData != null || count < this.nodeGraph.nodeBucketLimit) {
       // Either already exists or has room in the bucket
       // We want to add or update the node
-      await this.nodeGraph.setNode(nodeId, nodeAddress, tran);
+      await this.nodeGraph.setNode(nodeId, nodeAddress, undefined, tran);
       // Updating the refreshBucket timer
       await this.updateRefreshBucketDelay(
         bucketIndex,
@@ -787,7 +787,7 @@ class NodeManager {
           )} and adding ${nodesUtils.encodeNodeId(nodeId)}`,
         );
         await this.nodeGraph.unsetNode(oldNodeId, tran);
-        await this.nodeGraph.setNode(nodeId, nodeAddress, tran);
+        await this.nodeGraph.setNode(nodeId, nodeAddress, undefined, tran);
         // Updating the refreshBucket timer
         await this.updateRefreshBucketDelay(
           bucketIndex,

diff --git a/tests/nodes/NodeGraph.test.ts b/tests/nodes/NodeGraph.test.ts
@@ -273,24 +273,35 @@ describe(`${NodeGraph.name} test`, () => {
     await nodeGraph.stop();
   });
   test('get bucket with multiple nodes', async () => {
+    const nodeBucketLimit = 25;
     const nodeGraph = await NodeGraph.createNodeGraph({
       db,
       keyRing,
       logger,
+      nodeBucketLimit
     });
     // Contiguous node IDs starting from 0
-    let nodeIds = Array.from({ length: 25 }, (_, i) =>
+    let nodeIds = Array.from({ length: nodeBucketLimit }, (_, i) =>
       IdInternal.create<NodeId>(
         utils.bigInt2Bytes(BigInt(i), keyRing.getNodeId().byteLength),
       ),
     );
     nodeIds = nodeIds.filter((nodeId) => !nodeId.equals(keyRing.getNodeId()));
-    for (const nodeId of nodeIds) {
-      await utils.sleep(100);
-      await nodeGraph.setNode(nodeId, {
-        host: '127.0.0.1',
-        port: 55555,
-      } as NodeAddress);
+    const lastUpdatedNow = utils.getUnixtime();
+    const lastUpdatedTimes = Array.from({ length: nodeBucketLimit }, (_, i) => {
+      return lastUpdatedNow - i * 100;
+    });
+    for (let i = 0; i < nodeIds.length; i++) {
+      const nodeId = nodeIds[i];
+      const lastUpdated = lastUpdatedTimes[i];
+      await nodeGraph.setNode(
+        nodeId,
+        {
+          host: '127.0.0.1',
+          port: 55555,
+        } as NodeAddress,
+        lastUpdated
+      );
     }
     // Use first and last buckets because node IDs may be split between buckets
     const bucketIndexFirst = nodesUtils.bucketIndex(