Only test multi accept if reuse port supported

Summary: Some contbuild machines aren't on 3.10 yet.

Test Plan:
fbconfig folly/experimental/wangle/bootstrap; fbmake runtests
tested on 3.2 and 3.10

Reviewed By: jsedgwick@fb.com

Subscribers: doug, fugalh, folly-diffs@

FB internal diff: D1732040

Tasks: 5800250

Signature: t1:1732040:1418250452:a3203ab5769494594f2bf0b50f1c62052ddeb24c

diff --git a/folly/experimental/wangle/bootstrap/BootstrapTest.cpp b/folly/experimental/wangle/bootstrap/BootstrapTest.cpp
index b3cf00da0e8f96a88196412824f1ad0c6361b7f4..25bb75ea1bef9414a15db3f68f94f638fbaa4a87 100644 (file)
--- a/folly/experimental/wangle/bootstrap/BootstrapTest.cpp
+++ b/folly/experimental/wangle/bootstrap/BootstrapTest.cpp
@@ -138,6 +138,20 @@ TEST(Bootstrap, ServerAcceptGroupTest) {
 TEST(Bootstrap, ServerAcceptGroup2Test) {
   // Verify that server is using the accept IO group
 
+  // Check if reuse port is supported, if not, don't run this test
+  try {
+    EventBase base;
+    auto serverSocket = AsyncServerSocket::newSocket(&base);
+    serverSocket->bind(0);
+    serverSocket->listen(0);
+    serverSocket->startAccepting();
+    serverSocket->setReusePortEnabled(true);
+    serverSocket->stopAccepting();
+  } catch(...) {
+    LOG(INFO) << "Reuse port probably not supported";
+    return;
+  }
+
   TestServer server;
   auto factory = std::make_shared<TestPipelineFactory>();
   server.childPipeline(factory);

diff --git a/folly/experimental/wangle/bootstrap/ServerBootstrap.h b/folly/experimental/wangle/bootstrap/ServerBootstrap.h
index f7389d98d2c1928da26c426697819e7463c3c792..85edb646e8031c8547ca49f96a5254e2a7c7d519 100644 (file)
--- a/folly/experimental/wangle/bootstrap/ServerBootstrap.h
+++ b/folly/experimental/wangle/bootstrap/ServerBootstrap.h
@@ -145,7 +145,7 @@ class ServerBootstrap {
     }
 
     bool reusePort = false;
-    if (acceptor_group_->numThreads() >= 0) {
+    if (acceptor_group_->numThreads() > 1) {
       reusePort = true;
     }