parallelvirtualcluster
/
pvc
1
0
Fork 0
Code Issues 11 Pull Requests Projects Releases 111 Wiki Activity

Avoid raise/handle deadlocks 

Can cause log flooding in some edge cases and isn't really needed any
longer. Use a proper conditional followed by an actual error handler.
This commit is contained in:
Joshua Boniface 2022-10-03 14:04:12 -04:00
parent 096bcdfd75
commit 5942aa50fc
1 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
node-daemon/pvcnoded/util/keepalive.py
View File

@ -661,8 +661,6 @@ def node_keepalive(logger, config, zkhandler, this_node):
zkhandler.read("base.config.migration_target_selector") zkhandler.read("base.config.migration_target_selector")
!= config["migration_target_selector"] != config["migration_target_selector"]
): ):
raise
except Exception:
zkhandler.write( zkhandler.write(
[ [
( (
@ -671,6 +669,12 @@ def node_keepalive(logger, config, zkhandler, this_node):
) )
] ]
) )
except Exception:
logger.out(
"Failed to set migration target selector in Zookeeper",
state="e",
prefix="main-thread",
)
# Set the upstream IP in Zookeeper for clients to read # Set the upstream IP in Zookeeper for clients to read
if config["enable_networking"]: if config["enable_networking"]:
@ -680,11 +684,15 @@ def node_keepalive(logger, config, zkhandler, this_node):
zkhandler.read("base.config.upstream_ip") zkhandler.read("base.config.upstream_ip")
!= config["upstream_floating_ip"] != config["upstream_floating_ip"]
): ):
raise
except Exception:
zkhandler.write( zkhandler.write(
[("base.config.upstream_ip", config["upstream_floating_ip"])] [("base.config.upstream_ip", config["upstream_floating_ip"])]
) )
except Exception:
logger.out(
"Failed to set upstream floating IP in Zookeeper",
state="e",
prefix="main-thread",
)
# Get past state and update if needed # Get past state and update if needed
if debug: if debug: