From: Sage Weil <sage@redhat.com>
Date: Mon, 28 Mar 2016 14:48:42 +0000 (-0400)
Subject: Merge pull request #7820 from yuyuyu101/remove-exper
X-Git-Tag: v10.1.1~87
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b83f339f1dbcba4e48c7f4a36235ab9e7c3c9837;p=ceph.git

Merge pull request #7820 from yuyuyu101/remove-exper

msg/async: remove experiment feature

Reviewed-by: Sage Weil <sage@redhat.com>
---

b83f339f1dbcba4e48c7f4a36235ab9e7c3c9837
diff --cc src/msg/Messenger.cc
index 0fec5f3bfedb,edf7712727b9..98cc86fcfad3
--- a/src/msg/Messenger.cc
+++ b/src/msg/Messenger.cc
@@@ -24,15 -23,12 +24,14 @@@ Messenger *Messenger::create(CephContex
  			     uint64_t nonce, uint64_t features)
  {
    int r = -1;
 -  srand(time(NULL));
 -  if (type == "random")
 -    r = rand() % 2; // random does not include xio
 +  if (type == "random") {
 +    thread_local unsigned seed = (unsigned) time(nullptr) +
 +      (unsigned) std::hash<std::thread::id>()(std::this_thread::get_id());
 +    r = rand_r(&seed) % 2; // random does not include xio
 +  }
    if (r == 0 || type == "simple")
      return new SimpleMessenger(cct, name, lname, nonce, features);
-   else if ((r == 1 || type == "async") &&
- 	   cct->check_experimental_feature_enabled("ms-type-async"))
+   else if (r == 1 || type == "async")
      return new AsyncMessenger(cct, name, lname, nonce, features);
  #ifdef HAVE_XIO
    else if ((type == "xio") &&