From 45bff593decbe5217ef7c0eb5ed5b549e6e76e87 Mon Sep 17 00:00:00 2001 From: Samuel Just Date: Mon, 23 Mar 2015 11:46:35 -0700 Subject: [PATCH] Revert "Merge pull request #3641 from athanatos/wip-10731" This reverts commit 54a22236a00ab18ec62c6e7df1117055d5fd0ef1, reversing changes made to 7eca03e290f278bdf3a9613e0f383ec49f40b645. Conflicts: src/include/ceph_features.h --- src/include/ceph_features.h | 2 -- src/osd/ReplicatedPG.cc | 7 +------ 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/src/include/ceph_features.h b/src/include/ceph_features.h index ef5d3f2b5dd91..7f036161651ff 100644 --- a/src/include/ceph_features.h +++ b/src/include/ceph_features.h @@ -62,7 +62,6 @@ #define CEPH_FEATURE_CRUSH_V4 (1ULL<<48) /* straw2 buckets */ #define CEPH_FEATURE_OSD_MIN_SIZE_RECOVERY (1ULL<<49) // duplicated since it was introduced at the same time as MIN_SIZE_RECOVERY -#define CEPH_FEATURE_OSD_DEGRADED_WRITES (1ULL<<49) #define CEPH_FEATURE_OSD_PROXY_FEATURES (1ULL<<49) /* overlap w/ above */ #define CEPH_FEATURE_RESERVED2 (1ULL<<61) /* slow down, we are almost out... */ @@ -149,7 +148,6 @@ static inline unsigned long long ceph_sanitize_features(unsigned long long f) { CEPH_FEATURE_MDS_QUOTA | \ CEPH_FEATURE_CRUSH_V4 | \ CEPH_FEATURE_OSD_MIN_SIZE_RECOVERY | \ - CEPH_FEATURE_OSD_DEGRADED_WRITES | \ 0ULL) #define CEPH_FEATURES_SUPPORTED_DEFAULT CEPH_FEATURES_ALL diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc index f0bc46729c34d..c941544d7c299 100644 --- a/src/osd/ReplicatedPG.cc +++ b/src/osd/ReplicatedPG.cc @@ -1450,13 +1450,8 @@ void ReplicatedPG::do_op(OpRequestRef& op) * We can enable degraded writes on ec pools by blocking such a write * to a peer until all previous writes have completed. For now, we * will simply block them. - * - * We also block if our peers do not support DEGRADED_WRITES. */ - if ((pool.info.ec_pool() || - !(get_min_peer_features() & CEPH_FEATURE_OSD_DEGRADED_WRITES)) && - write_ordered && - is_degraded_object(head)) { + if (pool.info.ec_pool() && write_ordered && is_degraded_object(head)) { wait_for_degraded_object(head, op); return; } -- 2.39.5