]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: loadgen fix rgw crash issue 18765/head
authorEnming Zhang <enming.zhang@umcloud.com>
Wed, 25 Oct 2017 13:10:56 +0000 (21:10 +0800)
committerNathan Cutler <ncutler@suse.com>
Mon, 6 Nov 2017 13:48:45 +0000 (14:48 +0100)
When generating random bucket name and object name during
loadgen processing, RGW will crash. The reason is calling
"gen_rand_alphanumeric" with "cct = NULL".

Fixes: http://tracker.ceph.com/issues/22006
Signed-off-by: Enming Zhang <enming.zhang@umcloud.com>
(cherry picked from commit 7d021782e29c74eca36a9bb6ca59930f87093115)

src/rgw/rgw_loadgen_process.cc

index 13a344e3b46946dc2ae0b39cf86abbfa215b2e00..0f5c7c285a5f6185e9ebb2623e3145bbbc172819 100644 (file)
@@ -44,7 +44,7 @@ void RGWLoadGenProcess::run()
   for (i = 0; i < num_buckets; i++) {
     buckets[i] = "/loadgen";
     string& bucket = buckets[i];
-    append_rand_alpha(NULL, bucket, bucket, 16);
+    append_rand_alpha(cct, bucket, bucket, 16);
 
     /* first create a bucket */
     gen_request("PUT", bucket, 0, &failed);
@@ -60,7 +60,7 @@ void RGWLoadGenProcess::run()
 
   for (i = 0; i < num_objs; i++) {
     char buf[16 + 1];
-    gen_rand_alphanumeric(NULL, buf, sizeof(buf));
+    gen_rand_alphanumeric(cct, buf, sizeof(buf));
     buf[16] = '\0';
     objs[i] = buckets[i % num_buckets] + "/" + buf;
   }