From: Kefu Chai <kchai@redhat.com>
Date: Wed, 4 Dec 2019 00:06:40 +0000 (-0800)
Subject: tools/osdmaptool.cc: do not use deprecated std::random_shuffle()
X-Git-Tag: v12.2.13~18^2~5
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=bf7651bca8e452c81895f652eb0953cd234521e9;p=ceph.git

tools/osdmaptool.cc: do not use deprecated std::random_shuffle()
the use of `std::random_shuffle()` was introduced by
b946308 .

in this change, it is replaced using `std::shuffle()`.

Fixes: https://tracker.ceph.com/issues/43084

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 30dfef208d859a67c1f1b13c314735861c536e85)

Conflicts:
	src/tools/osdmaptool.cc (randomizing pools here instead of rules)
---

diff --git a/src/tools/osdmaptool.cc b/src/tools/osdmaptool.cc
index f15a9ba4871cb..fb55dbad771e9 100644
--- a/src/tools/osdmaptool.cc
+++ b/src/tools/osdmaptool.cc
@@ -390,8 +390,8 @@ int main(int argc, const char **argv)
       cout << "No pools available" << std::endl;
       goto skip_upmap;
     }
-    srand(time(0));
-    random_shuffle (pools.begin(), pools.end());
+    std::random_device rd;
+    std::shuffle(pools.begin(), pools.end(), std::mt19937{rd()});
     cout << "pools ";
     for (auto& i: pools)
       cout << osdmap.get_pool_name(i) << " ";