Merge pull request #13760 from zhangsw/fix-rgw-torrent-uri

rgw: get torrent request's parameter is not the same as amazon s3. Reviewed-by: Casey Bodley <cbodley@redhat.com>
ceph · Mar 9, 2017 · 5877780 · 5877780
2 parents 2bb96e0 + a0aa859
commit 5877780
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/PendingReleaseNotes b/PendingReleaseNotes
@@ -88,3 +88,7 @@
 * The rados copy-get-classic operation has been removed since it has not been
   used by the OSD since before hammer.  It is unlikely any librados user is
   using this operation explicitly since there is also the more modern copy-get.
+
+* The RGW api for getting object torrent has changed its params from 'get_torrent'
+  to 'torrent' so that it can be compatible with Amazon S3. Now the request for 
+  object torrent is like 'GET /ObjectName?torrent'.
diff --git a/src/rgw/rgw_torrent.h b/src/rgw/rgw_torrent.h
@@ -29,7 +29,7 @@ struct req_state;
 #define PIECE_LENGTH       "piece length"
 #define PIECES             "pieces"
 #define INFO_PIECES        "info"
-#define GET_TORRENT        "get_torrent"
+#define GET_TORRENT        "torrent"
 
 class TorrentBencode
 {