From bf7651bca8e452c81895f652eb0953cd234521e9 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Tue, 3 Dec 2019 16:06:40 -0800 Subject: [PATCH] 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 (cherry picked from commit 30dfef208d859a67c1f1b13c314735861c536e85) Conflicts: src/tools/osdmaptool.cc (randomizing pools here instead of rules) --- src/tools/osdmaptool.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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) << " "; -- 2.39.5