mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-23 19:56:01 +00:00
Merge pull request #59005 from hyperbolic2346/mwilson/node-name-fix
Automatic merge from submit-queue (batch tested with PRs 59053, 59005). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Forcing get_node_name to continue searching for a node name. There was a race condition where the kubelet was restarting and we were querying the api server for this node. In that case, we may get a valid list of nodes that doesn't include our node. This would cause the code to just raise an exception. Now we wait the full timeout before raising the exception. **What this PR does / why we need it**: Fixes a race condition on the get_node_name function inside the kubernetes-worker charm. **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: Fixes # **Special notes for your reviewer**: **Release note**: ```release-note Fixed a race condition inside kubernetes-worker that would result in a temporary error situation. ```
This commit is contained in:
commit
7fe25af6b1
@ -979,31 +979,30 @@ def get_node_name():
|
||||
while time.time() < deadline:
|
||||
try:
|
||||
raw = check_output(cmd)
|
||||
break
|
||||
except CalledProcessError:
|
||||
hookenv.log('Failed to get node name for node %s.'
|
||||
' Will retry.' % (gethostname()))
|
||||
time.sleep(1)
|
||||
else:
|
||||
msg = 'Failed to get node name for node %s' % gethostname()
|
||||
raise GetNodeNameFailed(msg)
|
||||
continue
|
||||
|
||||
result = json.loads(raw.decode('utf-8'))
|
||||
if 'items' in result:
|
||||
for node in result['items']:
|
||||
if 'status' not in node:
|
||||
continue
|
||||
if 'addresses' not in node['status']:
|
||||
continue
|
||||
result = json.loads(raw.decode('utf-8'))
|
||||
if 'items' in result:
|
||||
for node in result['items']:
|
||||
if 'status' not in node:
|
||||
continue
|
||||
if 'addresses' not in node['status']:
|
||||
continue
|
||||
|
||||
# find the hostname
|
||||
for address in node['status']['addresses']:
|
||||
if address['type'] == 'Hostname':
|
||||
if address['address'] == gethostname():
|
||||
return node['metadata']['name']
|
||||
# find the hostname
|
||||
for address in node['status']['addresses']:
|
||||
if address['type'] == 'Hostname':
|
||||
if address['address'] == gethostname():
|
||||
return node['metadata']['name']
|
||||
|
||||
# if we didn't match, just bail to the next node
|
||||
break
|
||||
time.sleep(1)
|
||||
|
||||
# if we didn't match, just bail to the next node
|
||||
break
|
||||
msg = 'Failed to get node name for node %s' % gethostname()
|
||||
raise GetNodeNameFailed(msg)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user