From: Sage Weil Date: Sun, 12 Aug 2018 18:36:08 +0000 (-0500) Subject: mon/OSDMonitor: remove 'osd pool {get,set} auid ...' X-Git-Tag: v14.0.1~431^2~9 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b83b4d5874f440e64c178e0ee752d5daa98e0dad;p=ceph.git mon/OSDMonitor: remove 'osd pool {get,set} auid ...' Signed-off-by: Sage Weil --- diff --git a/doc/man/8/ceph.rst b/doc/man/8/ceph.rst index 0367284d86c2..27c027cd4b16 100644 --- a/doc/man/8/ceph.rst +++ b/doc/man/8/ceph.rst @@ -945,8 +945,7 @@ Subcommand ``get`` gets pool parameter . Usage:: - ceph osd pool get size|min_size|pg_num| - pgp_num|crush_rule|auid|write_fadvise_dontneed + ceph osd pool get size|min_size|pg_num|pgp_num|crush_rule|write_fadvise_dontneed Only for tiered pools:: @@ -1002,7 +1001,7 @@ Usage:: hit_set_type|hit_set_period|hit_set_count|hit_set_fpp|debug_fake_ec_pool| target_max_bytes|target_max_objects|cache_target_dirty_ratio| cache_target_dirty_high_ratio| - cache_target_full_ratio|cache_min_flush_age|cache_min_evict_age|auid| + cache_target_full_ratio|cache_min_flush_age|cache_min_evict_age| min_read_recency_for_promote|write_fadvise_dontneed|hit_set_grade_decay_rate| hit_set_search_last_n {--yes-i-really-mean-it} diff --git a/src/mon/MonCommands.h b/src/mon/MonCommands.h index d20728e88cc8..f91ddbd8bae6 100644 --- a/src/mon/MonCommands.h +++ b/src/mon/MonCommands.h @@ -954,11 +954,11 @@ COMMAND("osd pool rename " \ "rename to ", "osd", "rw", "cli,rest") COMMAND("osd pool get " \ "name=pool,type=CephPoolname " \ - "name=var,type=CephChoices,strings=size|min_size|pg_num|pgp_num|crush_rule|hashpspool|nodelete|nopgchange|nosizechange|write_fadvise_dontneed|noscrub|nodeep-scrub|hit_set_type|hit_set_period|hit_set_count|hit_set_fpp|use_gmt_hitset|auid|target_max_objects|target_max_bytes|cache_target_dirty_ratio|cache_target_dirty_high_ratio|cache_target_full_ratio|cache_min_flush_age|cache_min_evict_age|erasure_code_profile|min_read_recency_for_promote|all|min_write_recency_for_promote|fast_read|hit_set_grade_decay_rate|hit_set_search_last_n|scrub_min_interval|scrub_max_interval|deep_scrub_interval|recovery_priority|recovery_op_priority|scrub_priority|compression_mode|compression_algorithm|compression_required_ratio|compression_max_blob_size|compression_min_blob_size|csum_type|csum_min_block|csum_max_block|allow_ec_overwrites", \ + "name=var,type=CephChoices,strings=size|min_size|pg_num|pgp_num|crush_rule|hashpspool|nodelete|nopgchange|nosizechange|write_fadvise_dontneed|noscrub|nodeep-scrub|hit_set_type|hit_set_period|hit_set_count|hit_set_fpp|use_gmt_hitset|target_max_objects|target_max_bytes|cache_target_dirty_ratio|cache_target_dirty_high_ratio|cache_target_full_ratio|cache_min_flush_age|cache_min_evict_age|erasure_code_profile|min_read_recency_for_promote|all|min_write_recency_for_promote|fast_read|hit_set_grade_decay_rate|hit_set_search_last_n|scrub_min_interval|scrub_max_interval|deep_scrub_interval|recovery_priority|recovery_op_priority|scrub_priority|compression_mode|compression_algorithm|compression_required_ratio|compression_max_blob_size|compression_min_blob_size|csum_type|csum_min_block|csum_max_block|allow_ec_overwrites", \ "get pool parameter ", "osd", "r", "cli,rest") COMMAND("osd pool set " \ "name=pool,type=CephPoolname " \ - "name=var,type=CephChoices,strings=size|min_size|pg_num|pgp_num|crush_rule|hashpspool|nodelete|nopgchange|nosizechange|write_fadvise_dontneed|noscrub|nodeep-scrub|hit_set_type|hit_set_period|hit_set_count|hit_set_fpp|use_gmt_hitset|target_max_bytes|target_max_objects|cache_target_dirty_ratio|cache_target_dirty_high_ratio|cache_target_full_ratio|cache_min_flush_age|cache_min_evict_age|auid|min_read_recency_for_promote|min_write_recency_for_promote|fast_read|hit_set_grade_decay_rate|hit_set_search_last_n|scrub_min_interval|scrub_max_interval|deep_scrub_interval|recovery_priority|recovery_op_priority|scrub_priority|compression_mode|compression_algorithm|compression_required_ratio|compression_max_blob_size|compression_min_blob_size|csum_type|csum_min_block|csum_max_block|allow_ec_overwrites " \ + "name=var,type=CephChoices,strings=size|min_size|pg_num|pgp_num|crush_rule|hashpspool|nodelete|nopgchange|nosizechange|write_fadvise_dontneed|noscrub|nodeep-scrub|hit_set_type|hit_set_period|hit_set_count|hit_set_fpp|use_gmt_hitset|target_max_bytes|target_max_objects|cache_target_dirty_ratio|cache_target_dirty_high_ratio|cache_target_full_ratio|cache_min_flush_age|cache_min_evict_age|min_read_recency_for_promote|min_write_recency_for_promote|fast_read|hit_set_grade_decay_rate|hit_set_search_last_n|scrub_min_interval|scrub_max_interval|deep_scrub_interval|recovery_priority|recovery_op_priority|scrub_priority|compression_mode|compression_algorithm|compression_required_ratio|compression_max_blob_size|compression_min_blob_size|csum_type|csum_min_block|csum_max_block|allow_ec_overwrites " \ "name=val,type=CephString " \ "name=force,type=CephChoices,strings=--yes-i-really-mean-it,req=false", \ "set pool parameter to ", "osd", "rw", "cli,rest") diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc index 0c94433a0eb1..072456a6aa13 100644 --- a/src/mon/OSDMonitor.cc +++ b/src/mon/OSDMonitor.cc @@ -4342,7 +4342,7 @@ namespace { NODELETE, NOPGCHANGE, NOSIZECHANGE, WRITE_FADVISE_DONTNEED, NOSCRUB, NODEEP_SCRUB, HIT_SET_TYPE, HIT_SET_PERIOD, HIT_SET_COUNT, HIT_SET_FPP, - USE_GMT_HITSET, AUID, TARGET_MAX_OBJECTS, TARGET_MAX_BYTES, + USE_GMT_HITSET, TARGET_MAX_OBJECTS, TARGET_MAX_BYTES, CACHE_TARGET_DIRTY_RATIO, CACHE_TARGET_DIRTY_HIGH_RATIO, CACHE_TARGET_FULL_RATIO, CACHE_MIN_FLUSH_AGE, CACHE_MIN_EVICT_AGE, @@ -4915,7 +4915,7 @@ bool OSDMonitor::preprocess_command(MonOpRequestRef op) {"hit_set_type", HIT_SET_TYPE}, {"hit_set_period", HIT_SET_PERIOD}, {"hit_set_count", HIT_SET_COUNT}, {"hit_set_fpp", HIT_SET_FPP}, {"use_gmt_hitset", USE_GMT_HITSET}, - {"auid", AUID}, {"target_max_objects", TARGET_MAX_OBJECTS}, + {"target_max_objects", TARGET_MAX_OBJECTS}, {"target_max_bytes", TARGET_MAX_BYTES}, {"cache_target_dirty_ratio", CACHE_TARGET_DIRTY_RATIO}, {"cache_target_dirty_high_ratio", CACHE_TARGET_DIRTY_HIGH_RATIO}, @@ -5026,9 +5026,6 @@ bool OSDMonitor::preprocess_command(MonOpRequestRef op) case PGP_NUM: f->dump_int("pgp_num", p->get_pgp_num()); break; - case AUID: - f->dump_int("auid", p->get_auid()); - break; case SIZE: f->dump_int("size", p->get_size()); break; @@ -5177,9 +5174,6 @@ bool OSDMonitor::preprocess_command(MonOpRequestRef op) case PGP_NUM: ss << "pgp_num: " << p->get_pgp_num() << "\n"; break; - case AUID: - ss << "auid: " << p->get_auid() << "\n"; - break; case SIZE: ss << "size: " << p->get_size() << "\n"; break; @@ -6746,12 +6740,6 @@ int OSDMonitor::prepare_command_pool_set(const cmdmap_t& cmdmap, } } p.min_size = n; - } else if (var == "auid") { - if (interr.length()) { - ss << "error parsing integer value '" << val << "': " << interr; - return -EINVAL; - } - p.auid = n; } else if (var == "pg_num") { if (p.has_flag(pg_pool_t::FLAG_NOPGCHANGE)) { ss << "pool pg_num change is disabled; you must unset nopgchange flag for the pool first"; diff --git a/src/pybind/mgr/restful/common.py b/src/pybind/mgr/restful/common.py index f1a46aec5bdd..f9dc943557e6 100644 --- a/src/pybind/mgr/restful/common.py +++ b/src/pybind/mgr/restful/common.py @@ -12,7 +12,7 @@ OSD_IMPLEMENTED_COMMANDS = [ # Valid values for the 'var' argument to 'ceph osd pool set' POOL_PROPERTIES_1 = [ 'size', 'min_size', 'pg_num', - 'crush_rule', 'hashpspool', 'auid', + 'crush_rule', 'hashpspool', ] POOL_PROPERTIES_2 = [ diff --git a/src/test/pybind/test_ceph_argparse.py b/src/test/pybind/test_ceph_argparse.py index 3e73211090eb..0d7232928c7b 100755 --- a/src/test/pybind/test_ceph_argparse.py +++ b/src/test/pybind/test_ceph_argparse.py @@ -1024,7 +1024,7 @@ class TestOSD(TestArgparse): def test_pool_get(self): for var in ('size', 'min_size', - 'pg_num', 'pgp_num', 'crush_rule', 'auid', 'fast_read', + 'pg_num', 'pgp_num', 'crush_rule', 'fast_read', 'scrub_min_interval', 'scrub_max_interval', 'deep_scrub_interval', 'recovery_priority', 'recovery_op_priority'): @@ -1044,7 +1044,7 @@ class TestOSD(TestArgparse): def test_pool_set(self): for var in ('size', 'min_size', 'pg_num', 'pgp_num', 'crush_rule', - 'hashpspool', 'auid', 'fast_read', + 'hashpspool', 'fast_read', 'scrub_min_interval', 'scrub_max_interval', 'deep_scrub_interval', 'recovery_priority', 'recovery_op_priority'):