RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-02 09:02:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Merge pull request #3641 from athanatos/wip-10731"

Browse Source 
This reverts commit 54a22236a0, reversing
changes made to 7eca03e290.

Conflicts:
	src/include/ceph_features.h
This commit is contained in:
Samuel Just 2015-03-23 11:46:35 -07:00
parent 6f23d3420f
commit 45bff593de
2 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/include/ceph_features.h
View File

@ -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

7
src/osd/ReplicatedPG.cc
View File

@ -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;
}