Skip to content

K
k3s
Commit e87b5376 authored by Mike Wilson's avatar Mike Wilson
Browse files
Options

Forcing get_node_name to continue searching for a node name if the returned list…

Forcing get_node_name to continue searching for a node name if the returned list of nodes doesn't include this one. There was a race condition where the kubelet was restarting and we were querying the api server for this node.
parent 03b3d599
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 4 deletions
cluster/juju/layers/kubernetes-worker/reactive/kubernetes_worker.py
View file @ e87b5376
...@@ -979,14 +979,11 @@ def get_node_name(): ...@@ -979,14 +979,11 @@ def get_node_name():
while time.time() < deadline: while time.time() < deadline:
try: try:
raw = check_output(cmd) raw = check_output(cmd)
break
except CalledProcessError: except CalledProcessError:
hookenv.log('Failed to get node name for node %s.' hookenv.log('Failed to get node name for node %s.'
' Will retry.' % (gethostname())) ' Will retry.' % (gethostname()))
time.sleep(1) time.sleep(1)
else: continue
msg = 'Failed to get node name for node %s' % gethostname()
raise GetNodeNameFailed(msg)
result = json.loads(raw.decode('utf-8')) result = json.loads(raw.decode('utf-8'))
if 'items' in result: if 'items' in result:
...@@ -1004,6 +1001,8 @@ def get_node_name(): ...@@ -1004,6 +1001,8 @@ def get_node_name():
# if we didn't match, just bail to the next node # if we didn't match, just bail to the next node
break break
time.sleep(1)
msg = 'Failed to get node name for node %s' % gethostname() msg = 'Failed to get node name for node %s' % gethostname()
raise GetNodeNameFailed(msg) raise GetNodeNameFailed(msg)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment