This is an automated email from the ASF dual-hosted git repository. grag pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/mesos.git
The following commit(s) were added to refs/heads/master by this push: new 65e18be Removed remaining domain socket code from the Windows build. 65e18be is described below commit 65e18bef2c5ff356ef74bac9aa79b128c5b186d9 Author: Greg Mann <g...@mesosphere.io> AuthorDate: Tue Feb 11 10:35:10 2020 -0800 Removed remaining domain socket code from the Windows build. These changes are needed to get the tests to run. Review: https://reviews.apache.org/r/72114/ --- src/slave/flags.hpp | 2 ++ src/slave/slave.cpp | 2 ++ src/tests/command_executor_tests.cpp | 2 ++ 3 files changed, 6 insertions(+) diff --git a/src/slave/flags.hpp b/src/slave/flags.hpp index 838aaee..c3ff887 100644 --- a/src/slave/flags.hpp +++ b/src/slave/flags.hpp @@ -182,8 +182,10 @@ public: #ifdef USE_SSL_SOCKET bool authenticate_http_executors; #endif // USE_SSL_SOCKET +#ifndef __WINDOWS__ bool http_executor_domain_sockets; Option<std::string> domain_socket_location; +#endif // __WINDOWS__ Option<Path> http_credentials; Option<std::string> hooks; Option<std::string> secret_resolver; diff --git a/src/slave/slave.cpp b/src/slave/slave.cpp index 75bf595..cce275a 100644 --- a/src/slave/slave.cpp +++ b/src/slave/slave.cpp @@ -11176,12 +11176,14 @@ map<string, string> executorEnvironment( environment["MESOS_HTTP_COMMAND_EXECUTOR"] = flags.http_command_executor ? "1" : "0"; +#ifndef __WINDOWS__ if (flags.http_executor_domain_sockets) { // If `http_executor_domain_sockets` is true, the location should have // been set either by the user or automatically during agent startup. CHECK(flags.domain_socket_location.isSome()); environment["MESOS_DOMAIN_SOCKET"] = *flags.domain_socket_location; } +#endif // __WINDOWS__ // Set executor's shutdown grace period. If set, the customized value // from `ExecutorInfo` overrides the default from agent flags. diff --git a/src/tests/command_executor_tests.cpp b/src/tests/command_executor_tests.cpp index 73f8006..4118a52 100644 --- a/src/tests/command_executor_tests.cpp +++ b/src/tests/command_executor_tests.cpp @@ -496,6 +496,7 @@ TEST_P(CommandExecutorTest, AllocationRoleEnvironmentVariable) } +#ifndef __WINDOWS__ // This test checks that the command executor can communicate // with the agent using unix domain sockets, when the necessary // flags are set on the agent. @@ -572,6 +573,7 @@ TEST_P(CommandExecutorTest, ExecutorDomainSockets) driver.stop(); driver.join(); } +#endif // __WINDOWS__ class HTTPCommandExecutorTest