fix allow_inline bug; remove fast_execution_in_network_thread in config

XiaoMi · Jul 12, 2016 · 2e43e94 · 2e43e94
1 parent 64ecbc4
commit 2e43e94
Show file tree

Hide file tree

Showing 77 changed files with 7 additions and 114 deletions.
diff --git a/include/dsn/internal/task.h b/include/dsn/internal/task.h
@@ -292,8 +292,7 @@ class rpc_request_task : public task, public transient_object
     rpc_request_task(message_ex* request, rpc_handler_info* h, service_node* node);
     ~rpc_request_task();
 
-    message_ex*  get_request() const
-    { return _request; }
+    message_ex*  get_request() const { return _request; }
 
     void enqueue() override;
 

diff --git a/src/apps/echo.csharp/config.ini b/src/apps/echo.csharp/config.ini
@@ -54,7 +54,6 @@ is_trace = true
 is_profile = true
 allow_inline = false
 rpc_call_channel = RPC_CHANNEL_TCP
-fast_execution_in_network_thread = false
 rpc_call_header_format_name = dsn
 rpc_timeout_milliseconds = 5000
 perf_test_rounds = 10000

diff --git a/src/apps/echo/config.ini b/src/apps/echo/config.ini
@@ -224,8 +224,6 @@ message_crc_required = false
 ; whether the task can be executed inlined with the caller task
 allow_inline = false
 
-; whether the rpc task can be executed in network threads directly
-fast_execution_in_network_thread = false
 
 ; 
 is_profile = true
@@ -273,8 +271,6 @@ is_trace = false
 ; whether the task can be executed inlined with the caller task
 allow_inline = false
 
-; whether the rpc task can be executed in network threads directly
-fast_execution_in_network_thread = false
 
 ; thread pool to execute the task
 pool_code = 
@@ -296,8 +292,6 @@ rpc_timeout_milliseconds = 5000
 ; whether the task can be executed inlined with the caller task
 allow_inline = false
 
-; whether the rpc task can be executed in network threads directly
-fast_execution_in_network_thread = false
 
 ; thread pool to execute the task
 pool_code = 
@@ -319,8 +313,6 @@ rpc_timeout_milliseconds = 5000
 ; whether the task can be executed inlined with the caller task
 allow_inline = false
 
-; whether the rpc task can be executed in network threads directly
-fast_execution_in_network_thread = false
 
 ; thread pool to execute the task
 pool_code = 
@@ -342,8 +334,6 @@ rpc_timeout_milliseconds = 5000
 ; whether the task can be executed inlined with the caller task
 allow_inline = false
 
-; whether the rpc task can be executed in network threads directly
-fast_execution_in_network_thread = false
 
 ; thread pool to execute the task
 pool_code = 
@@ -365,8 +355,6 @@ rpc_timeout_milliseconds = 5000
 ; whether the task can be executed inlined with the caller task
 allow_inline = false
 
-; whether the rpc task can be executed in network threads directly
-fast_execution_in_network_thread = false
 
 ; thread pool to execute the task
 pool_code = 
@@ -388,8 +376,6 @@ rpc_timeout_milliseconds = 5000
 ; whether the task can be executed inlined with the caller task
 allow_inline = false
 
-; whether the rpc task can be executed in network threads directly
-fast_execution_in_network_thread = false
 
 ; thread pool to execute the task
 pool_code = 
@@ -411,8 +397,6 @@ rpc_timeout_milliseconds = 5000
 ; whether the task can be executed inlined with the caller task
 allow_inline = false
 
-; whether the rpc task can be executed in network threads directly
-fast_execution_in_network_thread = false
 
 ; thread pool to execute the task
 pool_code = 
@@ -434,8 +418,6 @@ rpc_timeout_milliseconds = 5000
 ; whether the task can be executed inlined with the caller task
 allow_inline = false
 
-; whether the rpc task can be executed in network threads directly
-fast_execution_in_network_thread = false
 
 ; thread pool to execute the task
 pool_code = 
@@ -457,8 +439,6 @@ rpc_timeout_milliseconds = 5000
 ; whether the task can be executed inlined with the caller task
 allow_inline = false
 
-; whether the rpc task can be executed in network threads directly
-fast_execution_in_network_thread = false
 
 ; 
 is_profile = false
@@ -486,8 +466,6 @@ rpc_timeout_milliseconds = 5000
 ; whether the task can be executed inlined with the caller task
 allow_inline = false
 
-; whether the rpc task can be executed in network threads directly
-fast_execution_in_network_thread = false
 
 ; thread pool to execute the task
 pool_code = 
@@ -509,8 +487,6 @@ rpc_timeout_milliseconds = 5000
 ; whether the task can be executed inlined with the caller task
 allow_inline = false
 
-; whether the rpc task can be executed in network threads directly
-fast_execution_in_network_thread = false
 
 ; thread pool to execute the task
 pool_code = 
@@ -532,8 +508,6 @@ rpc_timeout_milliseconds = 5000
 ; whether the task can be executed inlined with the caller task
 allow_inline = false
 
-; whether the rpc task can be executed in network threads directly
-fast_execution_in_network_thread = false
 
 ; byte size of each rpc request test
 perf_test_payload_bytes = 
@@ -561,8 +535,6 @@ rpc_timeout_milliseconds = 5000
 ; whether the task can be executed inlined with the caller task
 allow_inline = false
 
-; whether the rpc task can be executed in network threads directly
-fast_execution_in_network_thread = false
 
 ; thread pool to execute the task
 pool_code = 
@@ -584,8 +556,6 @@ rpc_timeout_milliseconds = 5000
 ; whether the task can be executed inlined with the caller task
 allow_inline = false
 
-; whether the rpc task can be executed in network threads directly
-fast_execution_in_network_thread = false
 
 ; thread pool to execute the task
 pool_code = 
@@ -607,8 +577,6 @@ rpc_timeout_milliseconds = 5000
 ; whether the task can be executed inlined with the caller task
 allow_inline = false
 
-; whether the rpc task can be executed in network threads directly
-fast_execution_in_network_thread = false
 
 ; thread pool to execute the task
 pool_code = 
@@ -630,8 +598,6 @@ rpc_timeout_milliseconds = 5000
 ; whether the task can be executed inlined with the caller task
 allow_inline = false
 
-; whether the rpc task can be executed in network threads directly
-fast_execution_in_network_thread = false
 
 ; thread pool to execute the task
 pool_code = 
@@ -653,8 +619,6 @@ rpc_timeout_milliseconds = 5000
 ; whether the task can be executed inlined with the caller task
 allow_inline = false
 
-; whether the rpc task can be executed in network threads directly
-fast_execution_in_network_thread = false
 
 ; thread pool to execute the task
 pool_code = 

diff --git a/src/apps/nfs_test/config.ini b/src/apps/nfs_test/config.ini
@@ -61,7 +61,6 @@ is_trace = true
 is_profile = true
 allow_inline = false
 rpc_call_channel = RPC_CHANNEL_TCP
-fast_execution_in_network_thread = false
 rpc_message_header_format = dsn
 rpc_timeout_milliseconds = 5000
 

diff --git a/src/apps/skv.dll/config.ini b/src/apps/skv.dll/config.ini
@@ -104,7 +104,6 @@ is_trace = true
 is_profile = true
 allow_inline = false
 rpc_call_channel = RPC_CHANNEL_TCP
-fast_execution_in_network_thread = false
 rpc_message_header_format = dsn
 rpc_timeout_milliseconds = 5000
 

diff --git a/src/apps/skv/config-docker.ini b/src/apps/skv/config-docker.ini
@@ -121,7 +121,6 @@ is_trace = true
 is_profile = true
 allow_inline = false
 rpc_call_channel = RPC_CHANNEL_TCP
-fast_execution_in_network_thread = false
 rpc_message_header_format = dsn
 rpc_timeout_milliseconds = 5000
 

diff --git a/src/apps/skv/config-zk.ini b/src/apps/skv/config-zk.ini
@@ -113,7 +113,6 @@ is_trace = true
 is_profile = true
 allow_inline = false
 rpc_call_channel = RPC_CHANNEL_TCP
-fast_execution_in_network_thread = false
 rpc_message_header_format = dsn
 rpc_timeout_milliseconds = 5000
 

diff --git a/src/apps/skv/config.ini b/src/apps/skv/config.ini
@@ -107,7 +107,6 @@ is_trace = true
 is_profile = true
 allow_inline = false
 rpc_call_channel = RPC_CHANNEL_TCP
-fast_execution_in_network_thread = false
 rpc_message_header_format = dsn
 rpc_timeout_milliseconds = 5000
 rpc_message_delay_ms_min = 1

diff --git a/src/apps/skv/config.l1.ini b/src/apps/skv/config.l1.ini
@@ -84,7 +84,6 @@ is_trace = true
 is_profile = true
 allow_inline = false
 rpc_call_channel = RPC_CHANNEL_TCP
-fast_execution_in_network_thread = false
 rpc_message_header_format = dsn
 rpc_timeout_milliseconds = 5000
 

diff --git a/src/apps/skv/perf-config.ini b/src/apps/skv/perf-config.ini
@@ -115,7 +115,6 @@ is_trace = true
 is_profile = true
 allow_inline = false
 rpc_call_channel = RPC_CHANNEL_TCP
-fast_execution_in_network_thread = false
 rpc_message_header_format = dsn
 rpc_timeout_milliseconds = 5000
 

diff --git a/src/apps/skv/vconfig.ini b/src/apps/skv/vconfig.ini
@@ -103,7 +103,6 @@ is_trace = true
 is_profile = true
 allow_inline = false
 rpc_call_channel = RPC_CHANNEL_TCP
-fast_execution_in_network_thread = false
 rpc_message_header_format = dsn
 rpc_timeout_milliseconds = 5000
 

diff --git a/src/core/core/task.cpp b/src/core/core/task.cpp
@@ -462,10 +462,12 @@ void task::enqueue(task_worker_pool* pool)
         {
             tools::node_scoper ns(_node);
             exec_internal();
+            return;
         }
         else
         {
             exec_internal();
+            return;
         }
 
         //if (_spec->type == TASK_TYPE_COMPUTE)
@@ -474,12 +476,13 @@ void task::enqueue(task_worker_pool* pool)
         //    {
         //        tools::node_scoper ns(_node);
         //        exec_internal();
+        //        return;
         //    }
         //    else
         //    {
         //        exec_internal();
+        //        return;
         //    }
-        //    return;
         //}
 
         //// io tasks only inlined in io threads
@@ -540,7 +543,8 @@ rpc_request_task::rpc_request_task(message_ex* request, rpc_handler_info* h, ser
     : task(dsn_task_code_t(h->code),  // it is possible that request->local_rpc_code != h->code when it is handled in frameworks
         nullptr, 
         [](void*) { dassert(false, "rpc request task cannot be cancelled"); },
-        static_cast<int>(request->header->client.hash), node),
+        static_cast<int>(request->header->client.hash),
+        node),
     _request(request),
     _handler(h),
     _enqueue_ts_ns(0)

diff --git a/src/core/perf.tests/config-test.ini b/src/core/perf.tests/config-test.ini
@@ -59,7 +59,6 @@ is_trace = true
 is_profile = true
 allow_inline = false
 rpc_call_channel = RPC_CHANNEL_TCP
-fast_execution_in_network_thread = false
 rpc_message_header_format = dsn
 rpc_timeout_milliseconds = 5000
 

diff --git a/src/core/tests/config-test-corrupt-message.ini b/src/core/tests/config-test-corrupt-message.ini
@@ -61,7 +61,6 @@ is_trace = true
 is_profile = true
 allow_inline = false
 rpc_call_channel = RPC_CHANNEL_TCP
-fast_execution_in_network_thread = false
 rpc_message_header_format = dsn
 rpc_timeout_milliseconds = 1000
 

diff --git a/src/core/tests/config-test-fastrun.ini b/src/core/tests/config-test-fastrun.ini
@@ -51,7 +51,6 @@ is_trace = true
 is_profile = true
 allow_inline = false
 rpc_call_channel = RPC_CHANNEL_TCP
-fast_execution_in_network_thread = false
 rpc_message_header_format = dsn
 rpc_timeout_milliseconds = 1000
 

diff --git a/src/core/tests/config-test-posix-aio.ini b/src/core/tests/config-test-posix-aio.ini
@@ -48,7 +48,6 @@ is_trace = true
 is_profile = true
 allow_inline = false
 rpc_call_channel = RPC_CHANNEL_TCP
-fast_execution_in_network_thread = false
 rpc_message_header_format = dsn
 rpc_timeout_milliseconds = 1000
 

diff --git a/src/core/tests/config-test-sim.ini b/src/core/tests/config-test-sim.ini
@@ -67,7 +67,6 @@ is_trace = true
 is_profile = true
 allow_inline = false
 rpc_call_channel = RPC_CHANNEL_TCP
-fast_execution_in_network_thread = false
 rpc_message_header_format = dsn
 rpc_timeout_milliseconds = 1000
 

diff --git a/src/core/tests/config-test.ini b/src/core/tests/config-test.ini
@@ -77,7 +77,6 @@ is_trace = true
 is_profile = true
 allow_inline = false
 rpc_call_channel = RPC_CHANNEL_TCP
-fast_execution_in_network_thread = false
 rpc_message_header_format = dsn
 rpc_timeout_milliseconds = 1000
 

diff --git a/src/dist/app_daemon/config.ini b/src/dist/app_daemon/config.ini
@@ -106,7 +106,6 @@ is_trace = true
 is_profile = true
 allow_inline = false
 rpc_call_channel = RPC_CHANNEL_TCP
-fast_execution_in_network_thread = false
 rpc_message_header_format = dsn
 rpc_timeout_milliseconds = 5000
 

diff --git a/src/dist/cluster_scheduler/docker/config.ini b/src/dist/cluster_scheduler/docker/config.ini
@@ -67,7 +67,6 @@ is_trace = true
 is_profile = true
 allow_inline = false
 rpc_call_channel = RPC_CHANNEL_TCP
-fast_execution_in_network_thread = false
 rpc_message_header_format = dsn
 rpc_timeout_milliseconds = 5000
 

diff --git a/src/dist/cluster_scheduler/kubernetes/config.ini b/src/dist/cluster_scheduler/kubernetes/config.ini
@@ -67,7 +67,6 @@ is_trace = true
 is_profile = true
 allow_inline = false
 rpc_call_channel = RPC_CHANNEL_TCP
-fast_execution_in_network_thread = false
 rpc_message_header_format = dsn
 rpc_timeout_milliseconds = 5000
 

diff --git a/src/dist/deployment_service/config.ini b/src/dist/deployment_service/config.ini
@@ -91,7 +91,6 @@ is_trace = true
 is_profile = true
 allow_inline = false
 rpc_call_channel = RPC_CHANNEL_TCP
-fast_execution_in_network_thread = false
 rpc_call_header_format_name = dsn
 rpc_timeout_milliseconds = 5000
 perf_test_rounds = 10000

diff --git a/src/dist/replication/ddl_client/config.ini b/src/dist/replication/ddl_client/config.ini
@@ -65,7 +65,6 @@ is_trace = true
 is_profile = true
 allow_inline = false
 rpc_call_channel = RPC_CHANNEL_TCP
-fast_execution_in_network_thread = false
 rpc_call_header_format_name = dsn
 rpc_timeout_milliseconds = 5000
 

diff --git a/src/dist/replication/test/meta_test/unit_test/config-test.ini b/src/dist/replication/test/meta_test/unit_test/config-test.ini
@@ -49,7 +49,6 @@ is_trace = true
 is_profile = true
 allow_inline = false
 rpc_call_channel = RPC_CHANNEL_TCP
-fast_execution_in_network_thread = false
 rpc_message_header_format = dsn
 rpc_timeout_milliseconds = 5000
 

diff --git a/src/dist/replication/test/simple_kv/case-000.ini b/src/dist/replication/test/simple_kv/case-000.ini
@@ -92,7 +92,6 @@ is_trace = true
 is_profile = true
 allow_inline = false
 rpc_call_channel = RPC_CHANNEL_TCP
-fast_execution_in_network_thread = false
 rpc_message_header_format = dsn
 rpc_timeout_milliseconds = 5000
 

diff --git a/src/dist/replication/test/simple_kv/case-001.ini b/src/dist/replication/test/simple_kv/case-001.ini
@@ -92,7 +92,6 @@ is_trace = true
 is_profile = true
 allow_inline = false
 rpc_call_channel = RPC_CHANNEL_TCP
-fast_execution_in_network_thread = false
 rpc_message_header_format = dsn
 rpc_timeout_milliseconds = 5000