Disable multiple threads until we have figured out ordering requirements from the distributor/content layer.

2 files changed, 5 insertions, 13 deletions

diff --git a/messagebus/src/vespa/messagebus/network/rpcnetwork.cpp b/messagebus/src/vespa/messagebus/network/rpcnetwork.cpp
index b451a538161..8ff7ac87edc 100644
--- a/messagebus/src/vespa/messagebus/network/rpcnetwork.cpp
+++ b/messagebus/src/vespa/messagebus/network/rpcnetwork.cpp
@@ -86,11 +86,8 @@ RPCNetwork::SendContext::handleVersion(const vespalib::Version *version)
         }
     }
     if (shouldSend) {
-        auto rejected = _net.getExecutor().execute(vespalib::makeLambdaTask([this]() {
-            _net.send(*this);
-            delete this;
-        }));
-        assert (!rejected);
+        _net.send(*this);
+        delete this;
     }
 }
 
diff --git a/messagebus/src/vespa/messagebus/network/rpcsend.cpp b/messagebus/src/vespa/messagebus/network/rpcsend.cpp
index bc1ac75e778..cc6b7086756 100644
--- a/messagebus/src/vespa/messagebus/network/rpcsend.cpp
+++ b/messagebus/src/vespa/messagebus/network/rpcsend.cpp
@@ -148,8 +148,7 @@ RPCSend::send(RoutingNode &recipient, const vespalib::Version &version,
 void
 RPCSend::RequestDone(FRT_RPCRequest *req)
 {
-    auto rejected = _net->getExecutor().execute(makeLambdaTask([this, req]() { doRequestDone(req);}));
-    assert(!rejected);
+    doRequestDone(req);
 }
 
 void
@@ -221,10 +220,7 @@ RPCSend::decode(vespalib::stringref protocolName, const vespalib::Version & vers
 void
 RPCSend::handleReply(Reply::UP reply)
 {
-    auto rejected = _net->getExecutor().execute(makeLambdaTask([this, reply = std::move(reply)]() mutable {
-        doHandleReply(std::move(reply));
-    }));
-    assert (!rejected);
+    doHandleReply(std::move(reply));
 }
 
 void
@@ -252,8 +248,7 @@ void
 RPCSend::invoke(FRT_RPCRequest *req)
 {
     req->Detach();
-    auto rejected = _net->getExecutor().execute(makeLambdaTask([this, req]() { doRequest(req);}));
-    assert(!rejected);
+    doRequest(req);
 }
 
 void