From b6eeb5c2646c21d0b785cef5bd9f95a252f6e7db Mon Sep 17 00:00:00 2001 From: Joshua Boniface Date: Fri, 28 Sep 2018 19:34:35 -0400 Subject: [PATCH] Fix up some bugs in kv handling --- client-common/client_lib/zkhandler.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/client-common/client_lib/zkhandler.py b/client-common/client_lib/zkhandler.py index f1162ec2..0c7c487f 100644 --- a/client-common/client_lib/zkhandler.py +++ b/client-common/client_lib/zkhandler.py @@ -41,7 +41,11 @@ def writedata(zk_conn, kv): zk_transaction = zk_conn.transaction() # Proceed one KV pair at a time - for key, data in kv.items(): + for key in sorted(kv): + data = kv[key] + if not data: + data = '' + # Check if this key already exists or not if not zk_conn.exists(key): # We're creating a new key @@ -61,7 +65,7 @@ def writedata(zk_conn, kv): try: zk_transaction.check(key, new_version) except TypeError: - print('Zookeeper key "{}" does not match expected version'.format(first_key)) + print('Zookeeper key "{}" does not match expected version'.format(key)) return False # Commit the transaction