mgr/cephadm: start agent counter value at 1 when deploying it

Otherwise, the first set of metadata to come in will always
be considered out of date even if nothing else has happened
to make it out of date.

Signed-off-by: Adam King <adking@redhat.com>

diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm
index 19a76b2c130c9f8013cb43e138c11ebbf809a9b2..efcf79322cc7c72197797806953eda17f5b8c34a 100755 (executable)
--- a/src/cephadm/cephadm
+++ b/src/cephadm/cephadm
@@ -3519,7 +3519,7 @@ class CephadmAgent():
         self.listener_cert_path = os.path.join(self.daemon_dir, 'listener.crt')
         self.listener_key_path = os.path.join(self.daemon_dir, 'listener.key')
         self.listener_port = ''
-        self.ack = -1
+        self.ack = 1
         self.event = Event()
         self.mgr_listener = MgrListener(self)
         self.device_enhanced_scan = False

diff --git a/src/pybind/mgr/cephadm/serve.py b/src/pybind/mgr/cephadm/serve.py
index 9224bbafc92531f19a064c974159de7a62ff0c4a..41a5bebcd6f248f82fb60566510a7094ff5891b9 100644 (file)
--- a/src/pybind/mgr/cephadm/serve.py
+++ b/src/pybind/mgr/cephadm/serve.py
@@ -1083,6 +1083,7 @@ class CephadmServe:
 
                 if daemon_spec.daemon_type == 'agent':
                     self.mgr.cache.agent_timestamp[daemon_spec.host] = datetime_now()
+                    self.mgr.cache.agent_counter[daemon_spec.host] = 1
 
                 # refresh daemon state?  (ceph daemon reconfig does not need it)
                 if not reconfig or daemon_spec.daemon_type not in CEPH_TYPES: