MANTA-3273 "manta-adm zk fixup" broken with VMs in remote DCs

Reviewed by: Dave Pacheco <dap@joyent.com> Approved by: Dave Pacheco <dap@joyent.com>
TritonDataCenter · Oct 11, 2017 · 0635d02 · 0635d02
1 parent 8bfc424
commit 0635d02
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/lib/adm.js b/lib/adm.js
@@ -3959,7 +3959,8 @@ maAdm.prototype.auditZkServers = function ()
 
 		serverUuid = zkinstance.params['server_uuid'];
 		if (!self.ma_vms.hasOwnProperty(uuid)) {
-			if (self.ma_cns[serverUuid] !== null) {
+			if (self.ma_cns.hasOwnProperty(serverUuid) &&
+			    self.ma_cns[serverUuid] !== null) {
 				validationErrors.push(new VError(
 				    'nameservice instance "%s": VM appears ' +
 				    'to have been provisioned in this ' +

diff --git a/test/tst.zk.js b/test/tst.zk.js
@@ -112,8 +112,6 @@ function runTestCase(testcase, callback)
 				    'server_uuid': server_uuid
 				};
 			}
-		} else {
-			deployed.cns[server_uuid] = null;
 		}
 
 		deployed.instances[svcid].push({