From 5d6e2412879803c3cffded6c0a169bbba3e45cad Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Wed, 30 May 2018 16:21:40 -0400 Subject: [PATCH] Fix deadlock on collective create user There was a call to rpc-out from within a 'true' function, which is bad, fix this by only calling the 'true' function from 'true' function. --- confluent_server/confluent/config/configmanager.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/confluent_server/confluent/config/configmanager.py b/confluent_server/confluent/config/configmanager.py index 6ed317f6..d0c895b6 100644 --- a/confluent_server/confluent/config/configmanager.py +++ b/confluent_server/confluent/config/configmanager.py @@ -1051,7 +1051,7 @@ class ConfigManager(object): 'username': name } if attributemap is not None: - self.set_user(name, attributemap) + self._true_set_user(name, attributemap) _mark_dirtykey('users', name, self.tenant) _mark_dirtykey('idmap', uid) self._bg_sync_to_file()