Merge pull request ceph#51424 from NitzanMordhai/wip-nitzan-monclient-reconnect-finish-auth-with-error

yuriw · web-flow · commit f9df08c831b1 · 2023-06-05T11:33:45.000-04:00
mon/MonClient: before complete auth with error, reopen session

Reviewed-by: Greg Farnum &lt;gfarnum@redhat.com&gt;
diff --git a/src/mon/MonClient.cc b/src/mon/MonClient.cc
@@ -709,6 +709,11 @@ void MonClient::_finish_auth(int auth_err)
   if (!auth_err && active_con) {
     ceph_assert(auth);
     _check_auth_tickets();
+  } else if (auth_err == -EAGAIN && !active_con) {
+    ldout(cct,10) << __func__ 
+                  << " auth returned EAGAIN, reopening the session to try again"
+                  << dendl;
+    _reopen_session();
   }
   auth_cond.notify_all();
 }

Original file line number	Diff line number	Diff line change
`@@ -709,6 +709,11 @@ void MonClient::_finish_auth(int auth_err)`
`709`	`709`	`if (!auth_err && active_con) {`
`710`	`710`	`ceph_assert(auth);`
`711`	`711`	`_check_auth_tickets();`
	`712`	`+ } else if (auth_err == -EAGAIN && !active_con) {`
	`713`	`+ ldout(cct,10) << __func__`
	`714`	`+ << " auth returned EAGAIN, reopening the session to try again"`
	`715`	`+ << dendl;`
	`716`	`+ _reopen_session();`
`712`	`717`	`}`
`713`	`718`	`auth_cond.notify_all();`
`714`	`719`	`}`