Skip to content

Commit 628159f

Browse files
Ensure we are validating current Ceph status data for migration
Changes introduced in #86 and updated in #93 only partly considered when data is taken from `analyze_ceph` and when to query Ceph for current status data. This resulted in always assuming RGW daemons got successfully migrated immediately. Signed-off-by: Tobias Wolf <[email protected]>
1 parent 1e6aaab commit 628159f

File tree

1 file changed

+5
-1
lines changed
  • src/rookify/modules/migrate_rgws

1 file changed

+5
-1
lines changed

src/rookify/modules/migrate_rgws/main.py

+5-1
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,11 @@ def _migrate_rgw(self, rgw_host: str) -> None:
137137
)
138138

139139
while True:
140-
rgw_daemon_hosts = self._get_rgw_daemon_hosts()
140+
ceph_status = self.ceph.mon_command("status")
141+
142+
rgw_daemon_hosts = self._get_rgw_daemon_hosts_of_map(
143+
ceph_status["servicemap"]["services"]["rgw"]["daemons"]
144+
)
141145

142146
if rgw_host in rgw_daemon_hosts:
143147
break

0 commit comments

Comments
 (0)