From 7d021782e29c74eca36a9bb6ca59930f87093115 Mon Sep 17 00:00:00 2001 From: Enming Zhang Date: Wed, 25 Oct 2017 21:10:56 +0800 Subject: [PATCH] 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 --- src/rgw/rgw_loadgen_process.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/rgw/rgw_loadgen_process.cc b/src/rgw/rgw_loadgen_process.cc index 13a344e3b469..0f5c7c285a5f 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; } -- 2.47.3