antietcd 1.1.1 → 1.1.3

package/anticluster.js

@@ -191,6 +191,7 @@ class AntiCluster
         else
         {
             this.synced = false;
+            this.resync_state = null;
             this.antietcd.etctree.pause_leases();
         }
     }
@@ -250,7 +251,8 @@ class AntiCluster
 
     _continueResync()
     {
-        if (Object.values(this.resync_state.dumps).filter(d => !d).length > 0)
+        if (!this.resync_state ||
+            Object.values(this.resync_state.dumps).filter(d => !d).length > 0)
         {
             // Some dump(s) are still pending
             return;
@@ -319,7 +321,8 @@ class AntiCluster
 
     _finishResync()
     {
-        if (Object.values(this.resync_state.dumps).filter(d => !d).length > 0 ||
+        if (!this.resync_state ||
+            Object.values(this.resync_state.dumps).filter(d => !d).length > 0 ||
             Object.values(this.resync_state.loads).filter(d => !d.result).length > 0)
         {
             return;

package/antietcd.js

@@ -17,7 +17,7 @@ const AntiPersistence = require('./antipersistence.js');
 const AntiCluster = require('./anticluster.js');
 const { runCallbacks, de64, b64, RequestError } = require('./common.js');
 
-const VERSION = '1.1.1';
+const VERSION = '1.1.3';
 
 class AntiEtcd extends EventEmitter
 {

package/etctree.js

@@ -251,6 +251,10 @@ class EtcTree
                 {
                     delete this.leases[cur_old.lease].keys[key];
                 }
+                if (cur_new.lease && !this.leases[cur_new.lease])
+                {
+                    console.log('BUG: restoring a key with unknown lease '+cur_new.lease);
+                }
                 cur_old.lease = cur_new.lease;
                 if (cur_new.lease && this.leases[cur_new.lease])
                 {
@@ -277,17 +281,14 @@ class EtcTree
         {
             if (!cur_old.children[k])
             {
-                cur_old.children[k] = cur_new.children[k];
-            }
-            else
-            {
-                this._restore_diff(
-                    update_only, cur_old.children[k], cur_new.children[k],
-                    prefix === null ? k : prefix+'/'+k,
-                    cur_old.children[k].watchers ? [ ...watchers, ...cur_old.children[k].watchers ] : watchers,
-                    notifications
-                );
+                cur_old.children[k] = {};
             }
+            this._restore_diff(
+                update_only, cur_old.children[k], cur_new.children[k],
+                prefix === null ? k : prefix+'/'+k,
+                cur_old.children[k].watchers ? [ ...watchers, ...cur_old.children[k].watchers ] : watchers,
+                notifications
+            );
         }
         if (!update_only)
         {
@@ -818,6 +819,7 @@ class EtcTree
                 delete this.leases[cur.lease].keys[prefix === null ? '' : prefix];
             }
             cur.value = null;
+            cur.lease = null;
             cur.version = 0;
             cur.create_revision = null;
             cur.mod_revision = cur_revision;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "antietcd",
-  "version": "1.1.1",
+  "version": "1.1.3",
   "description": "Simplistic etcd replacement based on TinyRaft",
   "main": "antietcd.js",
   "scripts": {