From: Enming Zhang <enming.zhang@umcloud.com>
Date: Wed, 25 Oct 2017 13:10:56 +0000 (+0800)
Subject: rgw: loadgen fix rgw crash issue
X-Git-Tag: v12.2.3~212^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=cb38378e5dc4821c232b15a99b30aeeb7b9f9744;p=ceph.git

rgw: loadgen fix rgw crash issue

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)
---

diff --git a/src/rgw/rgw_loadgen_process.cc b/src/rgw/rgw_loadgen_process.cc
index 13a344e3b46..0f5c7c285a5 100644
--- a/src/rgw/rgw_loadgen_process.cc
+++ b/src/rgw/rgw_loadgen_process.cc
@@ -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;
   }