rgw : cleanup radosgw-admin temp command as it was deprecated

and also implementation code for this command was removed in commit
8d7c8828b02c46e119adc4b9e8f655551512fc2d

Fixes: http://tracker.ceph.com/issues/16071
Signed-off-by: Vikhyat Umrao <vumrao@redhat.com>
(cherry picked from commit 949f917af80ae0bd9a5448129d3ce8979acf7e0b)

diff --git a/doc/man/8/radosgw-admin.rst b/doc/man/8/radosgw-admin.rst
index b4d75ff2ca2379620847e4326d48574f854fccd8..550e551a17640fc7a98b5436a56a3c7005253e5c 100644 (file)
--- a/doc/man/8/radosgw-admin.rst
+++ b/doc/man/8/radosgw-admin.rst
@@ -159,10 +159,6 @@ which are as follows:
 :command:`usage trim`
   Trim usage information (with optional user and date range).
 
-:command:`temp remove`
-  Remove temporary objects that were created up to specified date
-  (and optional time).
-
 :command:`gc list`
   Dump expired garbage collection objects (specify --include-all to list all
   entries, including unexpired).

diff --git a/doc/radosgw/purge-temp.rst b/doc/radosgw/purge-temp.rst
deleted file mode 100644 (file)
index 91181f4..0000000
--- a/doc/radosgw/purge-temp.rst
+++ /dev/null
@@ -1,18 +0,0 @@
-========================
- Purging Temporary Data
-========================
-
-.. deprecated:: 0.52
-
-When you delete objects (and buckets/containers), the Gateway marks the  data
-for removal, but it is still available to users until it is purged. Since data
-still resides in storage until it is purged, it may take up available storage
-space. To ensure that data marked for deletion isn't taking up a significant
-amount of storage space, you should run the following command periodically:: 
-
-       radosgw-admin temp remove
-
-.. important:: Data marked for deletion may still be read. So consider
-   executing the foregoing command a reasonable interval after data
-   was marked for deletion.
-.. tip:: Consider setting up a ``cron`` job to purge data.
\ No newline at end of file

diff --git a/src/rgw/rgw_admin.cc b/src/rgw/rgw_admin.cc
index 87c27ede906e05455ce93e998b8729c6e8bb1774..37f6836e4487567513672f6779d8ac3766590d55 100644 (file)
--- a/src/rgw/rgw_admin.cc
+++ b/src/rgw/rgw_admin.cc
@@ -126,8 +126,6 @@ void _usage()
   cout << "  log rm                     remove log object\n";
   cout << "  usage show                 show usage (by user, date range)\n";
   cout << "  usage trim                 trim usage (by user, date range)\n";
-  cout << "  temp remove                remove temporary objects that were created up to\n";
-  cout << "                             specified date (and optional time)\n";
   cout << "  gc list                    dump expired garbage collection objects (specify\n";
   cout << "                             --include-all to list all entries, including unexpired)\n";
   cout << "  gc process                 manually process garbage\n";
@@ -409,7 +407,6 @@ static int get_cmd(const char *cmd, const char *prev_cmd, const char *prev_prev_
       strcmp(cmd, "replicalog") == 0 ||
       strcmp(cmd, "subuser") == 0 ||
       strcmp(cmd, "sync") == 0 ||
-      strcmp(cmd, "temp") == 0 ||
       strcmp(cmd, "usage") == 0 ||
       strcmp(cmd, "user") == 0 ||
       strcmp(cmd, "zone") == 0 ||

diff --git a/src/test/cli/radosgw-admin/help.t b/src/test/cli/radosgw-admin/help.t
index 978d45e942e9dcf1221eb40577acd46d3ac3d08b..c91d3e41ef73735db08a6ae061e97f745db533aa 100644 (file)
--- a/src/test/cli/radosgw-admin/help.t
+++ b/src/test/cli/radosgw-admin/help.t
@@ -78,8 +78,6 @@
     log rm                     remove log object
     usage show                 show usage (by user, date range)
     usage trim                 trim usage (by user, date range)
-    temp remove                remove temporary objects that were created up to
-                               specified date (and optional time)
     gc list                    dump expired garbage collection objects (specify
                                --include-all to list all entries, including unexpired)
     gc process                 manually process garbage