You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by ji...@apache.org on 2019/01/10 00:37:06 UTC
[mesos] branch 1.5.x updated (27acb05 -> b961ecf)
This is an automated email from the ASF dual-hosted git repository.
jieyu pushed a change to branch 1.5.x
in repository https://gitbox.apache.org/repos/asf/mesos.git.
from 27acb05 Fixed compilation error in SLRP.
new 0a5f54a Allowed CNI root directory to be in a persistent location.
new b961ecf Added MESOS-9492 to 1.5.3 CHANGELOG.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
CHANGELOG | 1 +
docs/cni.md | 7 +++
docs/configuration/agent.md | 9 ++++
.../mesos/isolators/network/cni/cni.cpp | 30 ++++++++-----
.../mesos/isolators/network/cni/paths.cpp | 14 +++++-
.../mesos/isolators/network/cni/paths.hpp | 9 +++-
src/slave/flags.cpp | 6 +++
src/slave/flags.hpp | 1 +
src/tests/containerizer/cni_isolator_tests.cpp | 51 +++++++++++++++++++---
9 files changed, 107 insertions(+), 21 deletions(-)
[mesos] 02/02: Added MESOS-9492 to 1.5.3 CHANGELOG.
Posted by ji...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jieyu pushed a commit to branch 1.5.x
in repository https://gitbox.apache.org/repos/asf/mesos.git
commit b961ecfad020a97772efe0a4c8aece14b4453026
Author: Jie Yu <yu...@gmail.com>
AuthorDate: Wed Jan 9 16:36:26 2019 -0800
Added MESOS-9492 to 1.5.3 CHANGELOG.
(cherry picked from commit 3fece812524db072c67e0c2d19985906477d3ee1)
---
CHANGELOG | 1 +
1 file changed, 1 insertion(+)
diff --git a/CHANGELOG b/CHANGELOG
index 19ad7b3..f09d913 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -8,6 +8,7 @@ Release Notes - Mesos - Version 1.5.3 (WIP)
* [MESOS-9332] - Nested container should run as the same user of its parent container by default.
* [MESOS-9411] - Validation of JWT tokens using HS256 hashing algorithm is not thread safe.
* [MESOS-9419] - Executor to framework message crashes master if framework has not re-registered.
+ * [MESOS-9492] - Persist CNI working directory across reboot.
Release Notes - Mesos - Version 1.5.2
[mesos] 01/02: Allowed CNI root directory to be in a persistent
location.
Posted by ji...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jieyu pushed a commit to branch 1.5.x
in repository https://gitbox.apache.org/repos/asf/mesos.git
commit 0a5f54ab321dc305657b12092e0c642afc2c6e5b
Author: Deepak Goel <de...@gmail.com>
AuthorDate: Tue Dec 18 22:04:06 2018 -0800
Allowed CNI root directory to be in a persistent location.
This patch added the support to configure the CNI root directory to be
under `work_dir` so that the network related information persist across
reboot which will allow cni isolator to do proper cleanup post reboot.
A new agent flag `--network_cni_root_dir_persist` has been introduced.
Review: https://reviews.apache.org/r/69590/
(cherry picked from commit 5ab822cfce6d27c86832645cbc007eee8791db5f)
*** Modified for 1.5.x ***
---
docs/cni.md | 7 +++
docs/configuration/agent.md | 9 ++++
.../mesos/isolators/network/cni/cni.cpp | 30 ++++++++-----
.../mesos/isolators/network/cni/paths.cpp | 14 +++++-
.../mesos/isolators/network/cni/paths.hpp | 9 +++-
src/slave/flags.cpp | 6 +++
src/slave/flags.hpp | 1 +
src/tests/containerizer/cni_isolator_tests.cpp | 51 +++++++++++++++++++---
8 files changed, 106 insertions(+), 21 deletions(-)
diff --git a/docs/cni.md b/docs/cni.md
index c45ce27..6b51c68 100644
--- a/docs/cni.md
+++ b/docs/cni.md
@@ -103,6 +103,13 @@ after Agent startup, the Agent needs to be restarted. The
and hence restarting the Agent (and therefore the `network/cni`
isolator) will not affect container orchestration.
+Optionally, the operator could specify the
+`--network_cni_root_dir_persist` flag. This flag would allow
+`network/cni` isolator to persist the network related information
+across reboot and allow `network/cni` isolator to carry out network
+cleanup post reboot. This is useful for the CNI networks that depend
+on the isolator to clean their network state.
+
#### <a name="adding-modifying-deleting"></a>Adding/Deleting/Modifying CNI networks
The `network/cni` isolator learns about all the CNI networks by
diff --git a/docs/configuration/agent.md b/docs/configuration/agent.md
index 2a72a64..448c417 100644
--- a/docs/configuration/agent.md
+++ b/docs/configuration/agent.md
@@ -1058,6 +1058,15 @@ a network configuration file in JSON format in the specified directory.
</tr>
<tr>
<td>
+ --[no-]network_cni_root_dir_persist
+ </td>
+ <td>
+This setting controls whether the CNI root directory persists across
+reboot or not.
+ </td>
+</tr>
+<tr>
+ <td>
--oversubscribed_resources_interval=VALUE
</td>
<td>
diff --git a/src/slave/containerizer/mesos/isolators/network/cni/cni.cpp b/src/slave/containerizer/mesos/isolators/network/cni/cni.cpp
index feede9a..51564b3 100644
--- a/src/slave/containerizer/mesos/isolators/network/cni/cni.cpp
+++ b/src/slave/containerizer/mesos/isolators/network/cni/cni.cpp
@@ -124,19 +124,21 @@ Try<Isolator*> NetworkCniIsolatorProcess::create(const Flags& flags)
return Error("Unable to load CNI config: " + networkConfigs.error());
}
+ const string cniRootDir = paths::getCniRootDir(flags);
+
// Create the CNI network information root directory if it does not exist.
- Try<Nothing> mkdir = os::mkdir(paths::ROOT_DIR);
+ Try<Nothing> mkdir = os::mkdir(cniRootDir);
if (mkdir.isError()) {
return Error(
"Failed to create CNI network information root directory at '" +
- string(paths::ROOT_DIR) + "': " + mkdir.error());
+ cniRootDir + "': " + mkdir.error());
}
- Result<string> rootDir = os::realpath(paths::ROOT_DIR);
+ Result<string> rootDir = os::realpath(cniRootDir);
if (!rootDir.isSome()) {
return Error(
"Failed to determine canonical path of CNI network information root"
- " directory '" + string(paths::ROOT_DIR) + "': " +
+ " directory '" + cniRootDir + "': " +
(rootDir.isError() ? rootDir.error() : "No such file or directory"));
}
@@ -1253,11 +1255,13 @@ Future<Nothing> NetworkCniIsolatorProcess::attach(
stringify(networkConfigJSON.get()) + "': " + checkpoint.error());
}
- VLOG(1) << "Invoking CNI plugin '" << plugin.get()
- << "' with network configuration '"
+ LOG(INFO) << "Invoking CNI plugin '" << plugin.get()
+ << "' to attach container " << containerId
+ << " to network '" << networkName << "'";
+
+ VLOG(1) << "Using network configuration '"
<< stringify(networkConfigJSON.get())
- << "' to attach container " << containerId << " to network '"
- << networkName << "'";
+ << "' for container " << containerId;
Try<Subprocess> s = subprocess(
plugin.get(),
@@ -1627,10 +1631,12 @@ Future<Nothing> NetworkCniIsolatorProcess::detach(
" to network '" + networkName + "'");
}
- VLOG(1) << "Invoking CNI plugin '" << plugin.get()
- << "' with network configuration '" << networkConfigPath
- << "' to detach container " << containerId << " from network '"
- << networkName << "'";
+ LOG(INFO) << "Invoking CNI plugin '" << plugin.get()
+ << "' to detach container " << containerId
+ << " from network '" << networkName << "'";
+
+ VLOG(1) << "Using network configuration at '" << networkConfigPath
+ << "' for container " << containerId;
Try<Subprocess> s = subprocess(
plugin.get(),
diff --git a/src/slave/containerizer/mesos/isolators/network/cni/paths.cpp b/src/slave/containerizer/mesos/isolators/network/cni/paths.cpp
index f9056c9..7354430 100644
--- a/src/slave/containerizer/mesos/isolators/network/cni/paths.cpp
+++ b/src/slave/containerizer/mesos/isolators/network/cni/paths.cpp
@@ -28,7 +28,19 @@ namespace slave {
namespace cni {
namespace paths {
-string getContainerDir(const string& rootDir, const string& containerId)
+string getCniRootDir(const Flags& flags)
+{
+ string workDir = flags.network_cni_root_dir_persist
+ ? flags.work_dir
+ : flags.runtime_dir;
+
+ return path::join(workDir, paths::CNI_DIR);
+}
+
+
+string getContainerDir(
+ const string& rootDir,
+ const string& containerId)
{
return path::join(rootDir, containerId);
}
diff --git a/src/slave/containerizer/mesos/isolators/network/cni/paths.hpp b/src/slave/containerizer/mesos/isolators/network/cni/paths.hpp
index 7678a7c..61269c9 100644
--- a/src/slave/containerizer/mesos/isolators/network/cni/paths.hpp
+++ b/src/slave/containerizer/mesos/isolators/network/cni/paths.hpp
@@ -20,6 +20,8 @@
using std::string;
using std::list;
+#include "slave/flags.hpp"
+
namespace mesos {
namespace internal {
namespace slave {
@@ -28,7 +30,7 @@ namespace paths {
// The root directory where we keep the information of CNI networks that each
// container joins. The layout is as follows:
-// /var/run/mesos/isolators/network/cni/
+// /<work_dir|runtime_dir>/isolators/network/cni/
// |- <ID of Container1>/
// | |-- ns -> /proc/<pid>/ns/net (bind mount)
// | |-- <Name of CNI network 1>/
@@ -41,7 +43,10 @@ namespace paths {
// | |-- network.info
// |-- <ID of ContainerID 2>/
// | ...
-constexpr char ROOT_DIR[] = "/var/run/mesos/isolators/network/cni";
+constexpr char CNI_DIR[] = "isolators/network/cni";
+
+
+std::string getCniRootDir(const Flags& flags);
string getContainerDir(const string& rootDir, const string& containerId);
diff --git a/src/slave/flags.cpp b/src/slave/flags.cpp
index ec8ff29..5a8e04a 100644
--- a/src/slave/flags.cpp
+++ b/src/slave/flags.cpp
@@ -1143,6 +1143,12 @@ mesos::internal::slave::Flags::Flags()
"the operator should install a network configuration file in JSON\n"
"format in the specified directory.");
+ add(&Flags::network_cni_root_dir_persist,
+ "network_cni_root_dir_persist",
+ "This setting controls whether the CNI root directory\n"
+ "persists across reboot or not.",
+ false);
+
add(&Flags::container_disk_watch_interval,
"container_disk_watch_interval",
"The interval between disk quota checks for containers. This flag is\n"
diff --git a/src/slave/flags.hpp b/src/slave/flags.hpp
index 91f7297..965f220 100644
--- a/src/slave/flags.hpp
+++ b/src/slave/flags.hpp
@@ -160,6 +160,7 @@ public:
Option<std::string> network_cni_plugins_dir;
Option<std::string> network_cni_config_dir;
+ bool network_cni_root_dir_persist;
Duration container_disk_watch_interval;
bool enforce_container_disk_quota;
Option<Modules> modules;
diff --git a/src/tests/containerizer/cni_isolator_tests.cpp b/src/tests/containerizer/cni_isolator_tests.cpp
index 364e2e3..71d0809 100644
--- a/src/tests/containerizer/cni_isolator_tests.cpp
+++ b/src/tests/containerizer/cni_isolator_tests.cpp
@@ -375,24 +375,25 @@ TEST_F(CniIsolatorTest, ROOT_VerifyCheckpointedInfo)
ContainerID containerId = *(containers->begin());
// Check if the CNI related information is checkpointed successfully.
+ const string cniRootDir = paths::getCniRootDir(flags);
const string containerDir =
- paths::getContainerDir(paths::ROOT_DIR, containerId.value());
+ paths::getContainerDir(cniRootDir, containerId.value());
EXPECT_TRUE(os::exists(containerDir));
EXPECT_TRUE(os::exists(paths::getNetworkDir(
- paths::ROOT_DIR, containerId.value(), "__MESOS_TEST__")));
+ cniRootDir, containerId.value(), "__MESOS_TEST__")));
EXPECT_TRUE(os::exists(paths::getNetworkConfigPath(
- paths::ROOT_DIR, containerId.value(), "__MESOS_TEST__")));
+ cniRootDir, containerId.value(), "__MESOS_TEST__")));
EXPECT_TRUE(os::exists(paths::getInterfaceDir(
- paths::ROOT_DIR, containerId.value(), "__MESOS_TEST__", "eth0")));
+ cniRootDir, containerId.value(), "__MESOS_TEST__", "eth0")));
EXPECT_TRUE(os::exists(paths::getNetworkInfoPath(
- paths::ROOT_DIR, containerId.value(), "__MESOS_TEST__", "eth0")));
+ cniRootDir, containerId.value(), "__MESOS_TEST__", "eth0")));
EXPECT_TRUE(os::exists(paths::getNamespacePath(
- paths::ROOT_DIR, containerId.value())));
+ cniRootDir, containerId.value())));
EXPECT_TRUE(os::exists(path::join(containerDir, "hostname")));
EXPECT_TRUE(os::exists(path::join(containerDir, "hosts")));
@@ -1994,6 +1995,44 @@ TEST_P(DefaultContainerDNSCniTest, ROOT_VerifyDefaultDNS)
driver.join();
}
+
+// This test verifies CNI root directory path.
+TEST_F(CniIsolatorTest, ROOT_VerifyCniRootDir)
+{
+ Try<Owned<cluster::Master>> master = StartMaster();
+ ASSERT_SOME(master);
+
+ slave::Flags flags = CreateSlaveFlags();
+ flags.isolation = "network/cni";
+
+ flags.network_cni_plugins_dir = cniPluginDir;
+ flags.network_cni_config_dir = cniConfigDir;
+
+ Owned<MasterDetector> detector = master.get()->createDetector();
+
+ Try<Owned<cluster::Slave>> slave = StartSlave(detector.get(), flags);
+ ASSERT_SOME(slave);
+
+ string cniRootDir = paths::getCniRootDir(flags);
+
+ ASSERT_EQ(path::join(flags.runtime_dir, paths::CNI_DIR), cniRootDir);
+ EXPECT_TRUE(os::exists(cniRootDir));
+
+ slave.get()->terminate();
+
+ // Enable the flag to test whether the directory
+ // has moved to a persistent location.
+ flags.network_cni_root_dir_persist = true;
+
+ slave = StartSlave(detector.get(), flags);
+ ASSERT_SOME(slave);
+
+ cniRootDir = paths::getCniRootDir(flags);
+
+ ASSERT_EQ(path::join(flags.work_dir, paths::CNI_DIR), cniRootDir);
+ EXPECT_TRUE(os::exists(cniRootDir));
+}
+
} // namespace tests {
} // namespace internal {
} // namespace mesos {