diff --git a/.env b/.env index adbe1dd9..0d311a92 100644 --- a/.env +++ b/.env @@ -65,8 +65,8 @@ SPDK_CENTOS_REPO_VER="9.0-21.el9" # Ceph Cluster CEPH_CLUSTER_VERSION="${CEPH_VERSION}" -CEPH_BRANCH=main -CEPH_SHA=latest +CEPH_BRANCH=wip-leonidc-0126-duplicate-dont-clear-sub--centos9-only +CEPH_SHA=b585f14b9818c27ea8f2d8ed8e33346db969b875 CEPH_DEVEL_MGR_PATH=../ceph diff --git a/control/state.py b/control/state.py index f0e41502..f6d9dc39 100644 --- a/control/state.py +++ b/control/state.py @@ -1121,9 +1121,10 @@ def update(self) -> bool: grouped_added = self._group_by_prefix(added, prefix_list) # Find OMAP changes same_keys = omap_state_keys & local_state_keys - for key in same_keys: - self.logger.info(f"same key: {key}, local: {local_state_dict[key]}," - f"omap: {omap_state_dict[key]}") + if ((omap_version - local_version) > 1) and ("discovery" not in self.id_text): + for key in same_keys: + self.logger.info(f"same key: {key}, local: {local_state_dict[key]}," + f"omap: {omap_state_dict[key]}") changed = { key: omap_state_dict[key] for key in same_keys