mon/PGMonitor: remove map_pg_creates, send_pg_creates commands

These shouldn't be triggered manually.

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/PendingReleaseNotes b/PendingReleaseNotes
index 427efd449c97b3e89beb36ef007e8dce7fc0583f..031300fec9aa53e7fd36df136844b8f07a09a9a7 100644 (file)
--- a/PendingReleaseNotes
+++ b/PendingReleaseNotes
@@ -4,3 +4,6 @@ v10.0.0
 * The rbd CLI no longer accepts the deprecated '--image-features' option
   during create, import, and clone operations.  The '--image-feature'
   option should be used instead.
+
+* The 'send_pg_creates' and 'map_pg_creates' mon CLI commands are
+  obsolete and no longer supported.

diff --git a/doc/man/8/ceph.rst b/doc/man/8/ceph.rst
index 72d87dd0484bcae1c8aa205d1543b29e8d84c5ec..1f7cbfeb4bf1578d5054894d46df0fcc0fab3bf9 100644 (file)
--- a/doc/man/8/ceph.rst
+++ b/doc/man/8/ceph.rst
@@ -47,7 +47,7 @@ Synopsis
 
 | **ceph** **osd** **tier** [ *add* \| *add-cache* \| *cache-mode* \| *remove* \| *remove-overlay* \| *set-overlay* ] ...
 
-| **ceph** **pg** [ *debug* \| *deep-scrub* \| *dump* \| *dump_json* \| *dump_pools_json* \| *dump_stuck* \| *force_create_pg* \| *getmap* \| *ls* \| *ls-by-osd* \| *ls-by-pool* \| *ls-by-primary* \| *map* \| *repair* \| *scrub* \| *send_pg_creates* \| *set_full_ratio* \| *set_nearfull_ratio* \| *stat* ] ...
+| **ceph** **pg** [ *debug* \| *deep-scrub* \| *dump* \| *dump_json* \| *dump_pools_json* \| *dump_stuck* \| *force_create_pg* \| *getmap* \| *ls* \| *ls-by-osd* \| *ls-by-pool* \| *ls-by-primary* \| *map* \| *repair* \| *scrub* \| *set_full_ratio* \| *set_nearfull_ratio* \| *stat* ] ...
 
 | **ceph** **quorum** [ *enter* \| *exit* ]
 
@@ -1230,12 +1230,6 @@ Usage::
 
        ceph pg scrub <pgid>
 
-Subcommand ``send_pg_creates`` triggers pg creates to be issued.
-
-Usage::
-
-       ceph pg send_pg_creates
-
 Subcommand ``set_full_ratio`` sets ratio at which pgs are considered full.
 
 Usage::

diff --git a/qa/workunits/cephtool/test.sh b/qa/workunits/cephtool/test.sh
index 1e80982623d696052346842f57aba6f1e979df55..5ff50dba6636aef0a77f8ba7897eb42623cf80a3 100755 (executable)
--- a/qa/workunits/cephtool/test.sh
+++ b/qa/workunits/cephtool/test.sh
@@ -1281,7 +1281,6 @@ function test_mon_pg()
   ceph pg repair 0.0
   ceph pg scrub 0.0
 
-  ceph pg send_pg_creates
   ceph pg set_full_ratio 0.90
   ceph pg dump --format=plain | grep '^full_ratio 0.9'
   ceph pg set_full_ratio 0.95

diff --git a/qa/workunits/mon/caps.py b/qa/workunits/mon/caps.py
index 0a0828d053be914f7887336ba233993190f3c2e2..44bd0c2e0d6885a6bee6d714eb03ad282de92017 100644 (file)
--- a/qa/workunits/mon/caps.py
+++ b/qa/workunits/mon/caps.py
@@ -233,9 +233,6 @@ def test_all():
         {
           'cmd':('pg getmap', '', 'r'),
           },
-        {
-          'cmd':('pg send_pg_creates', '', 'rw'),
-          },
         ],
       'mds':[
         {

diff --git a/qa/workunits/rest/test.py b/qa/workunits/rest/test.py
index 19808badb7c157145900aaa70cdbff316339df76..0c67b02d788ca24e90be823910253298cf2b9afd 100755 (executable)
--- a/qa/workunits/rest/test.py
+++ b/qa/workunits/rest/test.py
@@ -369,8 +369,6 @@ if __name__ == '__main__':
     expect('pg/repair?pgid=0.0', 'PUT', 200, '')
     expect('pg/scrub?pgid=0.0', 'PUT', 200, '')
 
-    expect('pg/send_pg_creates', 'PUT', 200, '')
-
     expect('pg/set_full_ratio?ratio=0.90', 'PUT', 200, '')
     r = expect('pg/dump', 'GET', 200, 'json', JSONHDR)
     assert(float(r.myjson['output']['full_ratio']) == 0.90)

diff --git a/src/mon/PGMonitor.cc b/src/mon/PGMonitor.cc
index 3ca06fd9e393c243739e25a47306ec26fe3c447b..fb0b53537d62f5c212612572e91a0fe7ffebe73e 100644 (file)
--- a/src/mon/PGMonitor.cc
+++ b/src/mon/PGMonitor.cc
@@ -1591,14 +1591,6 @@ bool PGMonitor::preprocess_command(MonOpRequestRef op)
     pg_map.encode(rdata);
     ss << "got pgmap version " << pg_map.version;
     r = 0;
-  } else if (prefix == "pg map_pg_creates") {
-    map_pg_creates();
-    ss << "mapped pg creates ";
-    r = 0;
-  } else if (prefix == "pg send_pg_creates") {
-    send_pg_creates();
-    ss << "sent pg creates ";
-    r = 0;
   } else if (prefix == "pg dump") {
     string val;
     vector<string> dumpcontents;

diff --git a/src/test/pybind/test_ceph_argparse.py b/src/test/pybind/test_ceph_argparse.py
index b0f608dd199578facac316bf83b389ef3c67f2af..fd449776ceea23dd221803a8f99aea1891eb53d0 100755 (executable)
--- a/src/test/pybind/test_ceph_argparse.py
+++ b/src/test/pybind/test_ceph_argparse.py
@@ -103,9 +103,6 @@ class TestPG(TestArgparse):
     def test_getmap(self):
         self.assert_valid_command(['pg', 'getmap'])
 
-    def test_send_pg_creates(self):
-        self.assert_valid_command(['pg', 'send_pg_creates'])
-
     def test_dump(self):
         self.assert_valid_command(['pg', 'dump'])
         self.assert_valid_command(['pg', 'dump',