commit 80021094b74b2c1c4976d4add174967041acb96d · pyrox.dev/nixpkgs

+12 -21

pkgs/applications/networking/cluster/mesos/default.nix

···

       1
       1
       -
       { stdenv, lib, makeWrapper, fetchurl, curl, sasl, openssh, autoconf

     

       2
       2
       -
       , automake, libtool, unzip, gnutar, jdk, maven, python, wrapPython

     

       1
       1
       +
       { stdenv, lib, makeWrapper, fetchurl, curl, sasl, openssh

     

       2
       2
       +
       , unzip, gnutar, jdk, python, wrapPython

     

       3
       3
        
       , setuptools, boto, pythonProtobuf, apr, subversion, gzip, systemd

     

       4
       4
        
       , leveldb, glog, perf, utillinux, libnl, iproute, openssl, libevent

     

       5
       5
       -
       , ethtool, coreutils, which, iptables

     

       6
       6
       -
       , bash

     

       5
       5
       +
       , ethtool, coreutils, which, iptables, maven

     

       6
       6
       +
       , bash, autoreconfHook

     

       7
       7
        
       }:

     

       8
       8
        
       

     

       9
       9
        
       let

     
···

       21
       21
        
         });

     

       22
       22
        
       

     

       23
       23
        
       in stdenv.mkDerivation rec {

     

       24
       24
       -
         version = "1.1.1";

     

       24
       24
       +
         version = "1.4.0";

     

       25
       25
        
         name = "mesos-${version}";

     

       26
       26
        
       

     

       27
       27
        
         enableParallelBuilding = true;

     
···

       29
       29
        
       

     

       30
       30
        
         src = fetchurl {

     

       31
       31
        
           url = "mirror://apache/mesos/${version}/${name}.tar.gz";

     

       32
       32
       -
           sha256 = "0f46ebb130d2d4a9732f95d0a71d80c8c5967f3c172b110f2ece316e05922115";

     

       32
       32
       +
           sha256 = "0c08kd226nrjwm2z2drpq4vi97h9r8b1xkdvkgh1114fxg7cyvys";

     

       33
       33
        
         };

     

       34
       34
        
       

     

       35
       35
        
         patches = [

     
···

       40
       40
        
           # see https://github.com/cstrahan/mesos/tree/nixos-${version}

     

       41
       41
        
           ./nixos.patch

     

       42
       42
        
         ];

     

       43
       43
       -
       

     

       43
       43
       +
         nativeBuildInputs = [

     

       44
       44
       +
           autoreconfHook

     

       45
       45
       +
         ];

     

       44
       46
        
         buildInputs = [

     

       45
       45
       -
           makeWrapper autoconf automake libtool curl sasl jdk maven

     

       47
       47
       +
           makeWrapper curl sasl jdk

     

       46
       48
        
           python wrapPython boto setuptools leveldb

     

       47
       47
       -
           subversion apr glog openssl libevent

     

       49
       49
       +
           subversion apr glog openssl libevent maven

     

       48
       50
        
         ] ++ lib.optionals stdenv.isLinux [

     

       49
       51
        
           libnl

     

       50
       52
        
         ];

     
···

       52
       54
        
         propagatedBuildInputs = [

     

       53
       55
        
           pythonProtobuf

     

       54
       56
        
         ];

     

       55
       55
       -
       

     

       56
       56
       -
         # note that we *must* statically link libprotobuf.

     

       57
       57
       -
         # if we dynamically link the lib, we get these errors:

     

       58
       58
       -
         # https://github.com/NixOS/nixpkgs/pull/19064#issuecomment-255082684

     

       59
       57
        
         preConfigure = ''

     

       60
       58
        
           # https://issues.apache.org/jira/browse/MESOS-6616

     

       61
       59
        
           configureFlagsArray+=(

     
···

       66
       64
        
           # <sys/types.h> instead of <sys/sysmacros.h>

     

       67
       65
        
           sed 1i'#include <sys/sysmacros.h>' -i src/linux/fs.cpp

     

       68
       66
        
           sed 1i'#include <sys/sysmacros.h>' -i src/slave/containerizer/mesos/isolators/gpu/isolator.cpp

     

       69
       69
       -
       

     

       70
       67
        
           substituteInPlace 3rdparty/stout/include/stout/os/posix/chown.hpp \

     

       71
       68
        
             --subst-var-by chown ${coreutils}/bin/chown

     

       72
       69
        
       

     

       73
       70
        
           substituteInPlace 3rdparty/stout/Makefile.am \

     

       74
       74
       -
             --replace "-lprotobuf" \

     

       75
       75
       -
                       "${pythonProtobuf.protobuf}/lib/libprotobuf.so"

     

       76
       71
        
       

     

       77
       72
        
           substituteInPlace 3rdparty/stout/include/stout/os/posix/fork.hpp \

     

       78
       73
        
             --subst-var-by sh ${bash}/bin/bash

     
···

       99
       94
        
             --subst-var-by mesos-resolve $out/bin/mesos-resolve

     

       100
       95
        
       

     

       101
       96
        
           substituteInPlace src/python/native_common/ext_modules.py.in \

     

       102
       102
       -
             --replace "-lprotobuf" \

     

       103
       103
       -
                       "${pythonProtobuf.protobuf}/lib/libprotobuf.so"

     

       104
       97
        
       

     

       105
       98
        
           substituteInPlace src/slave/containerizer/mesos/isolators/gpu/volume.cpp \

     

       106
       99
        
             --subst-var-by cp    ${coreutils}/bin/cp \

     
···

       124
       117
        
       

     

       125
       118
        
           substituteInPlace src/Makefile.am \

     

       126
       119
        
             --subst-var-by mavenRepo ${mavenRepo} \

     

       127
       127
       -
             --replace "-lprotobuf" \

     

       128
       128
       -
                       "${pythonProtobuf.protobuf}/lib/libprotobuf.so"

     

       129
       120
        
       

     

       130
       121
        
         '' + lib.optionalString stdenv.isLinux ''

     

       131
       122
        
       

     
···

       179
       170
        
           "--enable-libevent"

     

       180
       171
        
           "--with-libevent=${libevent.dev}"

     

       181
       172
        
           "--with-protobuf=${pythonProtobuf.protobuf}"

     

       182
       182
       -
           "PROTOBUF_JAR=${mavenRepo}/com/google/protobuf/protobuf-java/2.6.1/protobuf-java-2.6.1.jar"

     

       173
       173
       +
           "PROTOBUF_JAR=${mavenRepo}/com/google/protobuf/protobuf-java/3.3.0/protobuf-java-3.3.0.jar"

     

       183
       174
        
         ] ++ lib.optionals stdenv.isLinux [

     

       184
       175
        
           "--with-network-isolator"

     

       185
       176
        
           "--with-nl=${libnl.dev}"

+6 -4

pkgs/applications/networking/cluster/mesos/fetch-mesos-deps.sh

···

       1127
       1127
        
       fetchArtifact org/vafer/jdependency/0.7/jdependency-0.7.pom.sha1

     

       1128
       1128
        
       fetchArtifact org/vafer/jdependency/0.7/jdependency-0.7.jar

     

       1129
       1129
        
       fetchArtifact org/vafer/jdependency/0.7/jdependency-0.7.jar.sha1

     

       1130
       1130
       -
       fetchArtifact com/google/protobuf/protobuf-java/2.6.1/protobuf-java-2.6.1.pom

     

       1131
       1131
       -
       fetchArtifact com/google/protobuf/protobuf-java/2.6.1/protobuf-java-2.6.1.pom.sha1

     

       1132
       1132
       -
       fetchArtifact com/google/protobuf/protobuf-java/2.6.1/protobuf-java-2.6.1.jar

     

       1133
       1133
       -
       fetchArtifact com/google/protobuf/protobuf-java/2.6.1/protobuf-java-2.6.1.jar.sha1

     

       1130
       1130
       +
       fetchArtifact com/google/protobuf/protobuf-java/3.3.0/protobuf-java-3.3.0.pom

     

       1131
       1131
       +
       fetchArtifact com/google/protobuf/protobuf-java/3.3.0/protobuf-java-3.3.0.pom.sha1

     

       1132
       1132
       +
       fetchArtifact com/google/protobuf/protobuf-java/3.3.0/protobuf-java-3.3.0.jar

     

       1133
       1133
       +
       fetchArtifact com/google/protobuf/protobuf-java/3.3.0/protobuf-java-3.3.0.jar.sha1

     

       1134
       1134
       +
       fetchArtifact com/google/protobuf/protobuf-parent/3.3.0/protobuf-parent-3.3.0.pom

     

       1135
       1135
       +
       fetchArtifact com/google/protobuf/protobuf-parent/3.3.0/protobuf-parent-3.3.0.pom.sha1

     

       1134
       1136
        
       fetchArtifact com/google/google/1/google-1.pom

     

       1135
       1137
        
       fetchArtifact com/google/google/1/google-1.pom.sha1

     

       1136
       1138
        
       fetchArtifact com/google/guava/guava/11.0.2/guava-11.0.2.pom

+1 -1

pkgs/applications/networking/cluster/mesos/mesos-deps.nix

···

       6
       6
        
       

     

       7
       7
        
         outputHashAlgo = "sha256";

     

       8
       8
        
         outputHashMode = "recursive";

     

       9
       9
       -
         outputHash = "066ikswavq3l37x1s3pfdncyj77pvpa0kj14ax5dqb9njmsg0s11";

     

       9
       9
       +
         outputHash = "10h0qs7svw0cqjkyxs8z6s3qraa8ga920zfrr59rdlanbwg4klly";

     

       10
       10
        
       

     

       11
       11
        
         buildInputs = [ curl ];

     

       12
       12

+179 -195

pkgs/applications/networking/cluster/mesos/nixos.patch

···

       1
       1
       -
       diff --git a/3rdparty/stout/include/stout/os/posix/chown.hpp b/3rdparty/stout/include/stout/os/posix/chown.hpp

     

       2
       2
       -
       index c82e2e574..15d332107 100644

     

       3
       3
       -
       --- a/3rdparty/stout/include/stout/os/posix/chown.hpp

     

       4
       4
       -
       +++ b/3rdparty/stout/include/stout/os/posix/chown.hpp

     

       5
       5
       -
       @@ -34,7 +34,7 @@ inline Try<Nothing> chown(

     

       6
       6
       -
            // TODO(bmahler): Consider walking the file tree instead. We would need

     

       7
       7
       -
            // to be careful to not miss dotfiles.

     

       8
       8
       -
            std::string command =

     

       9
       9
       -
       -      "chown -R " + stringify(uid) + ':' + stringify(gid) + " '" + path + "'";

     

       10
       10
       -
       +      "@chown@ -R " + stringify(uid) + ':' + stringify(gid) + " '" + path + "'";

     

       11
       11
       -
        

     

       12
       12
       -
            int status = os::system(command);

     

       13
       13
       -
            if (status != 0) {

     

       14
       14
       -
       diff --git a/3rdparty/stout/include/stout/os/posix/fork.hpp b/3rdparty/stout/include/stout/os/posix/fork.hpp

     

       15
       15
       -
       index a29967dcb..290b98b50 100644

     

       16
       16
       -
       --- a/3rdparty/stout/include/stout/os/posix/fork.hpp

     

       17
       17
       -
       +++ b/3rdparty/stout/include/stout/os/posix/fork.hpp

     

       1
       1
       +
       diff --git i/3rdparty/stout/include/stout/os/posix/fork.hpp w/3rdparty/stout/include/stout/os/posix/fork.hpp

     

       2
       2
       +
       index a29967d..290b98b 100644

     

       3
       3
       +
       --- i/3rdparty/stout/include/stout/os/posix/fork.hpp

     

       4
       4
       +
       +++ w/3rdparty/stout/include/stout/os/posix/fork.hpp

     

       18
       5
        
       @@ -369,7 +369,7 @@ private:

     

       19
       6
        
            if (exec.isSome()) {

     

       20
       7
        
              // Execute the command (via '/bin/sh -c command').

     
···

       24
       11
        
              EXIT(EXIT_FAILURE)

     

       25
       12
        
                << "Failed to execute '" << command << "': " << os::strerror(errno);

     

       26
       13
        
            } else if (wait.isSome()) {

     

       27
       27
       -
       diff --git a/3rdparty/stout/include/stout/posix/os.hpp b/3rdparty/stout/include/stout/posix/os.hpp

     

       28
       28
       -
       index c37e64db6..d3d87b7f0 100644

     

       29
       29
       -
       --- a/3rdparty/stout/include/stout/posix/os.hpp

     

       30
       30
       -
       +++ b/3rdparty/stout/include/stout/posix/os.hpp

     

       31
       31
       -
       @@ -375,7 +375,7 @@ inline Option<std::string> getenv(const std::string& key)

     

       14
       14
       +
       diff --git i/3rdparty/stout/include/stout/posix/os.hpp w/3rdparty/stout/include/stout/posix/os.hpp

     

       15
       15
       +
       index 8511dfd..1e7be01 100644

     

       16
       16
       +
       --- i/3rdparty/stout/include/stout/posix/os.hpp

     

       17
       17
       +
       +++ w/3rdparty/stout/include/stout/posix/os.hpp

     

       18
       18
       +
       @@ -366,7 +366,7 @@ inline Try<std::set<pid_t>> pids(Option<pid_t> group, Option<pid_t> session)

     

       32
       19
        
        inline Try<Nothing> tar(const std::string& path, const std::string& archive)

     

       33
       20
        
        {

     

       34
       21
        
          Try<std::string> tarOut =

     
···

       37
       24
        
        

     

       38
       25
        
          if (tarOut.isError()) {

     

       39
       26
        
            return Error("Failed to archive " + path + ": " + tarOut.error());

     

       40
       40
       -
       diff --git a/src/Makefile.am b/src/Makefile.am

     

       41
       41
       -
       index 3bcc0f2df..e5cbc57e8 100644

     

       42
       42
       -
       --- a/src/Makefile.am

     

       43
       43
       -
       +++ b/src/Makefile.am

     

       44
       44
       -
       @@ -1545,7 +1545,7 @@ if HAS_JAVA

     

       27
       27
       +
       diff --git i/src/Makefile.am w/src/Makefile.am

     

       28
       28
       +
       index 68fff14..c572f92 100644

     

       29
       29
       +
       --- i/src/Makefile.am

     

       30
       30
       +
       +++ w/src/Makefile.am

     

       31
       31
       +
       @@ -1775,7 +1775,7 @@ if HAS_JAVA

     

       45
       32
        
        

     

       46
       33
        
        $(MESOS_JAR): $(MESOS_JAR_SOURCE) $(MESOS_JAR_GENERATED) java/mesos.pom

     

       47
       34
        
        	@echo "Building mesos-$(PACKAGE_VERSION).jar ..."

     
···

       50
       37
        
        

     

       51
       38
        
        # Convenience library for JNI bindings.

     

       52
       39
        
        # TODO(Charles Reiss): We really should be building the Java library

     

       53
       53
       -
       diff --git a/src/cli/mesos-scp b/src/cli/mesos-scp

     

       54
       54
       -
       index a71ab0708..1043d1b3c 100755

     

       55
       55
       -
       --- a/src/cli/mesos-scp

     

       56
       56
       -
       +++ b/src/cli/mesos-scp

     

       40
       40
       +
       diff --git i/src/cli/mesos-scp w/src/cli/mesos-scp

     

       41
       41
       +
       index a71ab07..1043d1b 100755

     

       42
       42
       +
       --- i/src/cli/mesos-scp

     

       43
       43
       +
       +++ w/src/cli/mesos-scp

     

       57
       44
        
       @@ -19,7 +19,8 @@ if sys.version_info < (2,6,0):

     

       58
       45
        
        

     

       59
       46
        
        

     
···

       64
       51
        
            try:

     

       65
       52
        
                process = subprocess.Popen(

     

       66
       53
        
                    cmd,

     

       67
       67
       -
       diff --git a/src/common/command_utils.cpp b/src/common/command_utils.cpp

     

       68
       68
       -
       index 09e805140..90bf65896 100644

     

       69
       69
       -
       --- a/src/common/command_utils.cpp

     

       70
       70
       -
       +++ b/src/common/command_utils.cpp

     

       71
       71
       -
       @@ -140,7 +140,7 @@ Future<Nothing> tar(

     

       54
       54
       +
       diff --git i/src/common/command_utils.cpp w/src/common/command_utils.cpp

     

       55
       55
       +
       index c50be76..388cc53 100644

     

       56
       56
       +
       --- i/src/common/command_utils.cpp

     

       57
       57
       +
       +++ w/src/common/command_utils.cpp

     

       58
       58
       +
       @@ -142,7 +142,7 @@ Future<Nothing> tar(

     

       72
       59
        
        

     

       73
       60
        
          argv.emplace_back(input);

     

       74
       61
        
        

     
···

       77
       64
        
            .then([]() { return Nothing(); });

     

       78
       65
        
        }

     

       79
       66
        
        

     

       80
       80
       -
       @@ -162,7 +162,7 @@ Future<Nothing> untar(

     

       67
       67
       +
       @@ -164,7 +164,7 @@ Future<Nothing> untar(

     

       81
       68
        
            argv.emplace_back(directory.get());

     

       82
       69
        
          }

     

       83
       70
        
        

     
···

       86
       73
        
            .then([]() { return Nothing(); });

     

       87
       74
        
        }

     

       88
       75
        
        

     

       89
       89
       -
       @@ -170,7 +170,7 @@ Future<Nothing> untar(

     

       76
       76
       +
       @@ -172,7 +172,7 @@ Future<Nothing> untar(

     

       90
       77
        
        Future<string> sha512(const Path& input)

     

       91
       78
        
        {

     

       92
       79
        
        #ifdef __linux__

     
···

       95
       82
        
          vector<string> argv = {

     

       96
       83
        
            cmd,

     

       97
       84
        
            input             // Input file to compute shasum.

     

       98
       98
       -
       @@ -206,7 +206,7 @@ Future<Nothing> gzip(const Path& input)

     

       85
       85
       +
       @@ -208,7 +208,7 @@ Future<Nothing> gzip(const Path& input)

     

       99
       86
        
            input

     

       100
       87
        
          };

     

       101
       88
        
        

     
···

       104
       91
        
            .then([]() { return Nothing(); });

     

       105
       92
        
        }

     

       106
       93
        
        

     

       107
       107
       -
       @@ -219,7 +219,7 @@ Future<Nothing> decompress(const Path& input)

     

       94
       94
       +
       @@ -221,7 +221,7 @@ Future<Nothing> decompress(const Path& input)

     

       108
       95
        
            input

     

       109
       96
        
          };

     

       110
       97
        
        

     
···

       113
       100
        
            .then([]() { return Nothing(); });

     

       114
       101
        
        }

     

       115
       102
        
        

     

       116
       116
       -
       diff --git a/src/launcher/fetcher.cpp b/src/launcher/fetcher.cpp

     

       117
       117
       -
       index 4456c2813..e22c8fc03 100644

     

       118
       118
       -
       --- a/src/launcher/fetcher.cpp

     

       119
       119
       -
       +++ b/src/launcher/fetcher.cpp

     

       120
       120
       -
       @@ -68,13 +68,13 @@ static Try<bool> extract(

     

       103
       103
       +
       diff --git i/src/launcher/fetcher.cpp w/src/launcher/fetcher.cpp

     

       104
       104
       +
       index 42980f5..3aebeed 100644

     

       105
       105
       +
       --- i/src/launcher/fetcher.cpp

     

       106
       106
       +
       +++ w/src/launcher/fetcher.cpp

     

       107
       107
       +
       @@ -80,17 +80,17 @@ static Try<bool> extract(

     

       121
       108
        
              strings::endsWith(sourcePath, ".tar.bz2") ||

     

       122
       109
        
              strings::endsWith(sourcePath, ".txz") ||

     

       123
       110
        
              strings::endsWith(sourcePath, ".tar.xz")) {

     

       124
       124
       -
       -    command = "tar -C '" + destinationDirectory + "' -xf";

     

       125
       125
       -
       +    command = "@tar@ -C '" + destinationDirectory + "' -xf";

     

       111
       111
       +
       -    command = {"tar", "-C", destinationDirectory, "-xf", sourcePath};

     

       112
       112
       +
       +    command = {"@tar@", "-C", destinationDirectory, "-xf", sourcePath};

     

       126
       113
        
          } else if (strings::endsWith(sourcePath, ".gz")) {

     

       127
       114
        
            string pathWithoutExtension = sourcePath.substr(0, sourcePath.length() - 3);

     

       128
       115
        
            string filename = Path(pathWithoutExtension).basename();

     

       129
       129
       -
       -    command = "gzip -dc > '" + destinationDirectory + "/" + filename + "' <";

     

       130
       130
       -
       +    command = "@gzip@ -dc > '" + destinationDirectory + "/" + filename + "' <";

     

       116
       116
       +
            string destinationPath = path::join(destinationDirectory, filename);

     

       117
       117
       +
        

     

       118
       118
       +
       -    command = {"gunzip", "-d", "-c"};

     

       119
       119
       +
       +    command = {"@gunzip@", "-d", "-c"};

     

       120
       120
       +
            in = Subprocess::PATH(sourcePath);

     

       121
       121
       +
            out = Subprocess::PATH(destinationPath);

     

       131
       122
        
          } else if (strings::endsWith(sourcePath, ".zip")) {

     

       132
       132
       -
       -    command = "unzip -o -d '" + destinationDirectory + "'";

     

       133
       133
       -
       +    command = "@unzip@ -o -d '" + destinationDirectory + "'";

     

       123
       123
       +
       -    command = {"unzip", "-o", "-d", destinationDirectory, sourcePath};

     

       124
       124
       +
       +    command = {"@unzip@", "-o", "-d", destinationDirectory, sourcePath};

     

       134
       125
        
          } else {

     

       135
       126
        
            return false;

     

       136
       127
        
          }

     

       137
       137
       -
       @@ -162,7 +162,7 @@ static Try<string> copyFile(

     

       128
       128
       +
       @@ -193,7 +193,7 @@ static Try<string> copyFile(

     

       138
       129
        
            const string& sourcePath,

     

       139
       130
        
            const string& destinationPath)

     

       140
       131
        
        {

     

       141
       141
       -
       -  const string command = "cp '" + sourcePath + "' '" + destinationPath + "'";

     

       142
       142
       -
       +  const string command = "@cp@ '" + sourcePath + "' '" + destinationPath + "'";

     

       143
       143
       -
        

     

       144
       144
       -
          LOG(INFO) << "Copying resource with command:" << command;

     

       132
       132
       +
       -  int status = os::spawn("cp", {"cp", sourcePath, destinationPath});

     

       133
       133
       +
       +  int status = os::spawn("cp", {"@cp@", sourcePath, destinationPath});

     

       145
       134
        
        

     

       146
       146
       -
       diff --git a/src/linux/perf.cpp b/src/linux/perf.cpp

     

       147
       147
       -
       index aa31982eb..8b5331b17 100644

     

       148
       148
       -
       --- a/src/linux/perf.cpp

     

       149
       149
       -
       +++ b/src/linux/perf.cpp

     

       150
       150
       -
       @@ -127,7 +127,7 @@ private:

     

       135
       135
       +
          if (status == -1) {

     

       136
       136
       +
            return ErrnoError("Failed to copy '" + sourcePath + "'");

     

       137
       137
       +
       diff --git i/src/linux/perf.cpp w/src/linux/perf.cpp

     

       138
       138
       +
       index b301e25..356a2cf 100644

     

       139
       139
       +
       --- i/src/linux/perf.cpp

     

       140
       140
       +
       +++ w/src/linux/perf.cpp

     

       141
       141
       +
       @@ -128,7 +128,7 @@ private:

     

       151
       142
        
            // NOTE: The supervisor childhook places perf in its own process group

     

       152
       143
        
            // and will kill the perf process when the parent dies.

     

       153
       144
        
            Try<Subprocess> _perf = subprocess(

     
···

       156
       147
        
                argv,

     

       157
       148
        
                Subprocess::PIPE(),

     

       158
       149
        
                Subprocess::PIPE(),

     

       159
       159
       -
       @@ -319,7 +319,7 @@ bool valid(const set<string>& events)

     

       160
       160
       -
          ostringstream command;

     

       161
       161
       -
        

     

       162
       162
       -
          // Log everything to stderr which is then redirected to /dev/null.

     

       163
       163
       -
       -  command << "perf stat --log-fd 2";

     

       164
       164
       -
       +  command << "@perf@ stat --log-fd 2";

     

       165
       165
       -
          foreach (const string& event, events) {

     

       166
       166
       -
            command << " --event " << event;

     

       167
       167
       -
          }

     

       168
       168
       -
       diff --git a/src/linux/systemd.cpp b/src/linux/systemd.cpp

     

       169
       169
       -
       index 6318f48fc..394d88d47 100644

     

       170
       170
       -
       --- a/src/linux/systemd.cpp

     

       171
       171
       -
       +++ b/src/linux/systemd.cpp

     

       150
       150
       +
       diff --git i/src/linux/systemd.cpp w/src/linux/systemd.cpp

     

       151
       151
       +
       index 6318f48..394d88d 100644

     

       152
       152
       +
       --- i/src/linux/systemd.cpp

     

       153
       153
       +
       +++ w/src/linux/systemd.cpp

     

       172
       154
        
       @@ -196,13 +196,21 @@ bool exists()

     

       173
       155
        
          // This is static as the init system should not change while we are running.

     

       174
       156
        
          static const bool exists = []() -> bool {

     
···

       209
       191
        
          Try<string> daemonReload = os::shell("systemctl daemon-reload");

     

       210
       192
        
          if (daemonReload.isError()) {

     

       211
       193
        
            return Error("Failed to reload systemd daemon: " + daemonReload.error());

     

       212
       212
       -
       diff --git a/src/python/cli/src/mesos/cli.py b/src/python/cli/src/mesos/cli.py

     

       213
       213
       -
       index f342992e0..354abf443 100644

     

       214
       214
       -
       --- a/src/python/cli/src/mesos/cli.py

     

       215
       215
       -
       +++ b/src/python/cli/src/mesos/cli.py

     

       194
       194
       +
       diff --git i/src/python/cli/src/mesos/cli.py w/src/python/cli/src/mesos/cli.py

     

       195
       195
       +
       index 4a9b558..c08a8b9 100644

     

       196
       196
       +
       --- i/src/python/cli/src/mesos/cli.py

     

       197
       197
       +
       +++ w/src/python/cli/src/mesos/cli.py

     

       216
       198
        
       @@ -40,7 +40,7 @@ def resolve(master):

     

       217
       199
        
            import subprocess

     

       218
       200
        
        

     
···

       222
       204
        
                stdin=None,

     

       223
       205
        
                stdout=subprocess.PIPE,

     

       224
       206
        
                stderr=subprocess.PIPE,

     

       225
       225
       -
       diff --git a/src/slave/containerizer/mesos/isolators/docker/volume/isolator.cpp b/src/slave/containerizer/mesos/isolators/docker/volume/isolator.cpp

     

       226
       226
       -
       index af9f3736b..f8554d414 100644

     

       227
       227
       -
       --- a/src/slave/containerizer/mesos/isolators/docker/volume/isolator.cpp

     

       228
       228
       -
       +++ b/src/slave/containerizer/mesos/isolators/docker/volume/isolator.cpp

     

       207
       207
       +
       diff --git i/src/slave/containerizer/mesos/isolators/docker/volume/isolator.cpp w/src/slave/containerizer/mesos/isolators/docker/volume/isolator.cpp

     

       208
       208
       +
       index 5b630c1..d63ad69 100644

     

       209
       209
       +
       --- i/src/slave/containerizer/mesos/isolators/docker/volume/isolator.cpp

     

       210
       210
       +
       +++ w/src/slave/containerizer/mesos/isolators/docker/volume/isolator.cpp

     

       229
       211
        
       @@ -499,7 +499,7 @@ Future<Option<ContainerLaunchInfo>> DockerVolumeIsolatorProcess::_prepare(

     

       230
       212
        
            // unsafe arbitrary commands).

     

       231
       213
        
            CommandInfo* command = launchInfo.add_pre_exec_commands();

     
···

       235
       217
        
            command->add_arguments("mount");

     

       236
       218
        
            command->add_arguments("-n");

     

       237
       219
        
            command->add_arguments("--rbind");

     

       238
       238
       -
       diff --git a/src/slave/containerizer/mesos/isolators/filesystem/linux.cpp b/src/slave/containerizer/mesos/isolators/filesystem/linux.cpp

     

       239
       239
       -
       index df16b8fee..4a17475bd 100644

     

       240
       240
       -
       --- a/src/slave/containerizer/mesos/isolators/filesystem/linux.cpp

     

       241
       241
       -
       +++ b/src/slave/containerizer/mesos/isolators/filesystem/linux.cpp

     

       242
       242
       -
       @@ -159,9 +159,9 @@ Try<Isolator*> LinuxFilesystemIsolatorProcess::create(const Flags& flags)

     

       220
       220
       +
       diff --git i/src/slave/containerizer/mesos/isolators/filesystem/linux.cpp w/src/slave/containerizer/mesos/isolators/filesystem/linux.cpp

     

       221
       221
       +
       index d7fe9a8..1361a4e 100644

     

       222
       222
       +
       --- i/src/slave/containerizer/mesos/isolators/filesystem/linux.cpp

     

       223
       223
       +
       +++ w/src/slave/containerizer/mesos/isolators/filesystem/linux.cpp

     

       224
       224
       +
       @@ -154,9 +154,9 @@ Try<Isolator*> LinuxFilesystemIsolatorProcess::create(const Flags& flags)

     

       243
       225
        
              // here because 'create' will only be invoked during

     

       244
       226
        
              // initialization.

     

       245
       227
        
              Try<string> mount = os::shell(

     
···

       252
       234
        
                  workDir->c_str(),

     

       253
       235
        
                  workDir->c_str(),

     

       254
       236
        
                  workDir->c_str(),

     

       255
       255
       -
       @@ -180,8 +180,8 @@ Try<Isolator*> LinuxFilesystemIsolatorProcess::create(const Flags& flags)

     

       237
       237
       +
       @@ -175,8 +175,8 @@ Try<Isolator*> LinuxFilesystemIsolatorProcess::create(const Flags& flags)

     

       256
       238
        
              LOG(INFO) << "Making '" << workDir.get() << "' a shared mount";

     

       257
       239
        
        

     

       258
       240
        
              Try<string> mount = os::shell(

     
···

       263
       245
        
                  workDir->c_str(),

     

       264
       246
        
                  workDir->c_str());

     

       265
       247
        
        

     

       266
       266
       -
       @@ -404,7 +404,7 @@ Try<vector<CommandInfo>> LinuxFilesystemIsolatorProcess::getPreExecCommands(

     

       248
       248
       +
       @@ -422,7 +422,7 @@ Try<vector<CommandInfo>> LinuxFilesystemIsolatorProcess::getPreExecCommands(

     

       267
       249
        
        

     

       268
       250
        
            CommandInfo command;

     

       269
       251
        
            command.set_shell(false);

     
···

       272
       254
        
            command.add_arguments("mount");

     

       273
       255
        
            command.add_arguments("-n");

     

       274
       256
        
            command.add_arguments("--rbind");

     

       275
       275
       -
       @@ -569,7 +569,7 @@ Try<vector<CommandInfo>> LinuxFilesystemIsolatorProcess::getPreExecCommands(

     

       257
       257
       +
       @@ -610,7 +610,7 @@ Try<vector<CommandInfo>> LinuxFilesystemIsolatorProcess::getPreExecCommands(

     

       276
       258
        
            // TODO(jieyu): Consider the mode in the volume.

     

       277
       259
        
            CommandInfo command;

     

       278
       260
        
            command.set_shell(false);

     
···

       281
       263
        
            command.add_arguments("mount");

     

       282
       264
        
            command.add_arguments("-n");

     

       283
       265
        
            command.add_arguments("--rbind");

     

       284
       284
       -
       diff --git a/src/slave/containerizer/mesos/isolators/filesystem/shared.cpp b/src/slave/containerizer/mesos/isolators/filesystem/shared.cpp

     

       285
       285
       -
       index a1283e5ee..a918427bf 100644

     

       286
       286
       -
       --- a/src/slave/containerizer/mesos/isolators/filesystem/shared.cpp

     

       287
       287
       -
       +++ b/src/slave/containerizer/mesos/isolators/filesystem/shared.cpp

     

       288
       288
       -
       @@ -207,7 +207,7 @@ Future<Option<ContainerLaunchInfo>> SharedFilesystemIsolatorProcess::prepare(

     

       266
       266
       +
       diff --git i/src/slave/containerizer/mesos/isolators/filesystem/shared.cpp w/src/slave/containerizer/mesos/isolators/filesystem/shared.cpp

     

       267
       267
       +
       index 927d95b..576dc63 100644

     

       268
       268
       +
       --- i/src/slave/containerizer/mesos/isolators/filesystem/shared.cpp

     

       269
       269
       +
       +++ w/src/slave/containerizer/mesos/isolators/filesystem/shared.cpp

     

       270
       270
       +
       @@ -208,7 +208,7 @@ Future<Option<ContainerLaunchInfo>> SharedFilesystemIsolatorProcess::prepare(

     

       289
       271
        
            }

     

       290
       272
        
        

     

       291
       273
        
            launchInfo.add_pre_exec_commands()->set_value(

     
···

       294
       276
        
          }

     

       295
       277
        
        

     

       296
       278
        
          return launchInfo;

     

       297
       297
       -
       diff --git a/src/slave/containerizer/mesos/isolators/gpu/isolator.cpp b/src/slave/containerizer/mesos/isolators/gpu/isolator.cpp

     

       298
       298
       -
       index e3756c920..cfe458b59 100644

     

       299
       299
       -
       --- a/src/slave/containerizer/mesos/isolators/gpu/isolator.cpp

     

       300
       300
       -
       +++ b/src/slave/containerizer/mesos/isolators/gpu/isolator.cpp

     

       301
       301
       -
       @@ -355,7 +355,7 @@ Future<Option<ContainerLaunchInfo>> NvidiaGpuIsolatorProcess::_prepare(

     

       279
       279
       +
       diff --git i/src/slave/containerizer/mesos/isolators/gpu/isolator.cpp w/src/slave/containerizer/mesos/isolators/gpu/isolator.cpp

     

       280
       280
       +
       index 25636b5..33ec315 100644

     

       281
       281
       +
       --- i/src/slave/containerizer/mesos/isolators/gpu/isolator.cpp

     

       282
       282
       +
       +++ w/src/slave/containerizer/mesos/isolators/gpu/isolator.cpp

     

       283
       283
       +
       @@ -401,7 +401,7 @@ Future<Option<ContainerLaunchInfo>> NvidiaGpuIsolatorProcess::_prepare(

     

       302
       284
        
            }

     

       303
       285
        
        

     

       304
       286
        
            launchInfo.add_pre_exec_commands()->set_value(

     
···

       307
       289
        
              volume.HOST_PATH() + " " + target);

     

       308
       290
        
          }

     

       309
       291
        
        

     

       310
       310
       -
       diff --git a/src/slave/containerizer/mesos/isolators/gpu/volume.cpp b/src/slave/containerizer/mesos/isolators/gpu/volume.cpp

     

       311
       311
       -
       index 478752f37..ab527f0cd 100644

     

       312
       312
       -
       --- a/src/slave/containerizer/mesos/isolators/gpu/volume.cpp

     

       313
       313
       -
       +++ b/src/slave/containerizer/mesos/isolators/gpu/volume.cpp

     

       314
       314
       -
       @@ -281,7 +281,7 @@ Try<NvidiaVolume> NvidiaVolume::create()

     

       292
       292
       +
       diff --git i/src/slave/containerizer/mesos/isolators/gpu/volume.cpp w/src/slave/containerizer/mesos/isolators/gpu/volume.cpp

     

       293
       293
       +
       index 536a3c7..e2819dd 100644

     

       294
       294
       +
       --- i/src/slave/containerizer/mesos/isolators/gpu/volume.cpp

     

       295
       295
       +
       +++ w/src/slave/containerizer/mesos/isolators/gpu/volume.cpp

     

       296
       296
       +
       @@ -274,7 +274,7 @@ Try<NvidiaVolume> NvidiaVolume::create()

     

       315
       297
        
            string path = path::join(hostPath, "bin", binary);

     

       316
       298
        
        

     

       317
       299
        
            if (!os::exists(path)) {

     
···

       320
       302
        
              Try<string> which = os::shell(command);

     

       321
       303
        
        

     

       322
       304
        
              if (which.isSome()) {

     

       323
       323
       -
       @@ -295,7 +295,7 @@ Try<NvidiaVolume> NvidiaVolume::create()

     

       305
       305
       +
       @@ -288,7 +288,7 @@ Try<NvidiaVolume> NvidiaVolume::create()

     

       324
       306
        
                                      : "No such file or directory"));

     

       325
       307
        
                }

     

       326
       308
        
        

     
···

       329
       311
        
                Try<string> cp = os::shell(command);

     

       330
       312
        
                if (cp.isError()) {

     

       331
       313
        
                  return Error("Failed to os::shell '" + command + "': " + cp.error());

     

       332
       332
       -
       @@ -367,7 +367,7 @@ Try<NvidiaVolume> NvidiaVolume::create()

     

       314
       314
       +
       @@ -360,7 +360,7 @@ Try<NvidiaVolume> NvidiaVolume::create()

     

       333
       315
        
                    Path(realpath.get()).basename());

     

       334
       316
        
        

     

       335
       317
        
                if (!os::exists(libraryPath)) {

     
···

       338
       320
        
                  Try<string> cp = os::shell(command);

     

       339
       321
        
                  if (cp.isError()) {

     

       340
       322
        
                    return Error("Failed to os::shell '" + command + "':"

     

       341
       341
       -
       diff --git a/src/slave/containerizer/mesos/isolators/namespaces/pid.cpp b/src/slave/containerizer/mesos/isolators/namespaces/pid.cpp

     

       342
       342
       -
       index 0d9ec57d9..a177e4476 100644

     

       343
       343
       -
       --- a/src/slave/containerizer/mesos/isolators/namespaces/pid.cpp

     

       344
       344
       -
       +++ b/src/slave/containerizer/mesos/isolators/namespaces/pid.cpp

     

       345
       345
       -
       @@ -94,7 +94,7 @@ Future<Option<ContainerLaunchInfo>> NamespacesPidIsolatorProcess::prepare(

     

       323
       323
       +
       diff --git i/src/slave/containerizer/mesos/isolators/namespaces/pid.cpp w/src/slave/containerizer/mesos/isolators/namespaces/pid.cpp

     

       324
       324
       +
       index 42bc2e1..2f9066e 100644

     

       325
       325
       +
       --- i/src/slave/containerizer/mesos/isolators/namespaces/pid.cpp

     

       326
       326
       +
       +++ w/src/slave/containerizer/mesos/isolators/namespaces/pid.cpp

     

       327
       327
       +
       @@ -131,7 +131,7 @@ Future<Option<ContainerLaunchInfo>> NamespacesPidIsolatorProcess::prepare(

     

       346
       328
        
          //

     

       347
       329
        
          // TOOD(jieyu): Consider unmount the existing /proc.

     

       348
       330
        
          launchInfo.add_pre_exec_commands()->set_value(

     
···

       351
       333
        
        

     

       352
       334
        
          return launchInfo;

     

       353
       335
        
        }

     

       354
       354
       -
       diff --git a/src/slave/containerizer/mesos/isolators/network/cni/cni.cpp b/src/slave/containerizer/mesos/isolators/network/cni/cni.cpp

     

       355
       355
       -
       index c87e6715a..6601cd1b3 100644

     

       356
       356
       -
       --- a/src/slave/containerizer/mesos/isolators/network/cni/cni.cpp

     

       357
       357
       -
       +++ b/src/slave/containerizer/mesos/isolators/network/cni/cni.cpp

     

       358
       358
       -
       @@ -262,9 +262,9 @@ Try<Isolator*> NetworkCniIsolatorProcess::create(const Flags& flags)

     

       336
       336
       +
       diff --git i/src/slave/containerizer/mesos/isolators/network/cni/cni.cpp w/src/slave/containerizer/mesos/isolators/network/cni/cni.cpp

     

       337
       337
       +
       index fc68f04..267b040 100644

     

       338
       338
       +
       --- i/src/slave/containerizer/mesos/isolators/network/cni/cni.cpp

     

       339
       339
       +
       +++ w/src/slave/containerizer/mesos/isolators/network/cni/cni.cpp

     

       340
       340
       +
       @@ -205,9 +205,9 @@ Try<Isolator*> NetworkCniIsolatorProcess::create(const Flags& flags)

     

       359
       341
        
              // here because 'create' will only be invoked during

     

       360
       342
        
              // initialization.

     

       361
       343
        
              Try<string> mount = os::shell(

     
···

       368
       350
        
                  rootDir->c_str(),

     

       369
       351
        
                  rootDir->c_str(),

     

       370
       352
        
                  rootDir->c_str(),

     

       371
       371
       -
       @@ -284,8 +284,8 @@ Try<Isolator*> NetworkCniIsolatorProcess::create(const Flags& flags)

     

       353
       353
       +
       @@ -227,8 +227,8 @@ Try<Isolator*> NetworkCniIsolatorProcess::create(const Flags& flags)

     

       372
       354
        
              LOG(INFO) << "Making '" << rootDir.get() << "' a shared mount";

     

       373
       355
        
        

     

       374
       356
        
              Try<string> mount = os::shell(

     
···

       379
       361
        
                  rootDir->c_str(),

     

       380
       362
        
                  rootDir->c_str());

     

       381
       363
        
        

     

       382
       382
       -
       diff --git a/src/slave/containerizer/mesos/isolators/network/cni/plugins/port_mapper/port_mapper.cpp b/src/slave/containerizer/mesos/isolators/network/cni/plugins/port_mapper/port_mapper.cpp

     

       383
       383
       -
       index b470f0c82..6110a43ee 100644

     

       384
       384
       -
       --- a/src/slave/containerizer/mesos/isolators/network/cni/plugins/port_mapper/port_mapper.cpp

     

       385
       385
       -
       +++ b/src/slave/containerizer/mesos/isolators/network/cni/plugins/port_mapper/port_mapper.cpp

     

       386
       386
       -
       @@ -303,7 +303,7 @@ Try<Nothing> PortMapper::addPortMapping(

     

       364
       364
       +
       diff --git i/src/slave/containerizer/mesos/isolators/network/cni/plugins/port_mapper/port_mapper.cpp w/src/slave/containerizer/mesos/isolators/network/cni/plugins/port_mapper/port_mapper.cpp

     

       365
       365
       +
       index 43cf3e4..94bad8b 100644

     

       366
       366
       +
       --- i/src/slave/containerizer/mesos/isolators/network/cni/plugins/port_mapper/port_mapper.cpp

     

       367
       367
       +
       +++ w/src/slave/containerizer/mesos/isolators/network/cni/plugins/port_mapper/port_mapper.cpp

     

       368
       368
       +
       @@ -301,7 +301,7 @@ Try<Nothing> PortMapper::addPortMapping(

     

       387
       369
        
              # Check if the `chain` exists in the iptable. If it does not

     

       388
       370
        
              # exist go ahead and install the chain in the iptables NAT

     

       389
       371
        
              # table.

     
···

       392
       374
        
              if [ $? -ne 0 ]; then

     

       393
       375
        
                # NOTE: When we create the chain, there is a possibility of a

     

       394
       376
        
                # race due to which a container launch can fail. This can

     

       395
       395
       -
       @@ -317,25 +317,25 @@ Try<Nothing> PortMapper::addPortMapping(

     

       377
       377
       +
       @@ -315,25 +315,25 @@ Try<Nothing> PortMapper::addPortMapping(

     

       396
       378
        
                # since it can happen only when the chain is created the first

     

       397
       379
        
                # time and two commands for creation of the chain are executed

     

       398
       380
        
                # simultaneously.

     
···

       422
       404
        
              chain,

     

       423
       405
        
              chain,

     

       424
       406
        
              chain,

     

       425
       425
       -
       @@ -362,7 +362,7 @@ Try<Nothing> PortMapper::delPortMapping()

     

       407
       407
       +
       @@ -360,7 +360,7 @@ Try<Nothing> PortMapper::delPortMapping()

     

       426
       408
        
              # The iptables command searches for the DNAT rules with tag

     

       427
       409
        
              # "container_id: <CNI_CONTAINERID>", and if it exists goes ahead

     

       428
       410
        
              # and deletes it.

     
···

       431
       413
        
              chain,

     

       432
       414
        
              getIptablesRuleTag()).get();

     

       433
       415
        
        

     

       434
       434
       -
       diff --git a/src/slave/containerizer/mesos/isolators/network/port_mapping.cpp b/src/slave/containerizer/mesos/isolators/network/port_mapping.cpp

     

       435
       435
       -
       index 20fb6ab35..46c160977 100644

     

       436
       436
       -
       --- a/src/slave/containerizer/mesos/isolators/network/port_mapping.cpp

     

       437
       437
       -
       +++ b/src/slave/containerizer/mesos/isolators/network/port_mapping.cpp

     

       438
       438
       -
       @@ -1393,19 +1393,19 @@ Try<Isolator*> PortMappingIsolatorProcess::create(const Flags& flags)

     

       416
       416
       +
       diff --git i/src/slave/containerizer/mesos/isolators/network/port_mapping.cpp w/src/slave/containerizer/mesos/isolators/network/port_mapping.cpp

     

       417
       417
       +
       index 57d4ccd..68c9577 100644

     

       418
       418
       +
       --- i/src/slave/containerizer/mesos/isolators/network/port_mapping.cpp

     

       419
       419
       +
       +++ w/src/slave/containerizer/mesos/isolators/network/port_mapping.cpp

     

       420
       420
       +
       @@ -1394,19 +1394,19 @@ Try<Isolator*> PortMappingIsolatorProcess::create(const Flags& flags)

     

       439
       421
        
          // Check the availability of a few Linux commands that we will use.

     

       440
       422
        
          // We use the blocking os::shell here because 'create' will only be

     

       441
       423
        
          // invoked during initialization.

     
···

       458
       440
        
          if (checkCommandIp.isError()) {

     

       459
       441
        
            return Error("Check command 'ip' failed: " + checkCommandIp.error());

     

       460
       442
        
          }

     

       461
       461
       -
       @@ -1925,9 +1925,9 @@ Try<Isolator*> PortMappingIsolatorProcess::create(const Flags& flags)

     

       443
       443
       +
       @@ -1940,9 +1940,9 @@ Try<Isolator*> PortMappingIsolatorProcess::create(const Flags& flags)

     

       462
       444
        
            // visible. It's OK to use the blocking os::shell here because

     

       463
       445
        
            // 'create' will only be invoked during initialization.

     

       464
       446
        
            Try<string> mount = os::shell(

     
···

       471
       453
        
                bindMountRoot->c_str(),

     

       472
       454
        
                bindMountRoot->c_str(),

     

       473
       455
        
                bindMountRoot->c_str(),

     

       474
       474
       -
       @@ -1944,8 +1944,8 @@ Try<Isolator*> PortMappingIsolatorProcess::create(const Flags& flags)

     

       456
       456
       +
       @@ -1959,8 +1959,8 @@ Try<Isolator*> PortMappingIsolatorProcess::create(const Flags& flags)

     

       475
       457
        
              // shared mount yet (possibly due to slave crash while preparing

     

       476
       458
        
              // the work directory mount). It's safe to re-do the following.

     

       477
       459
        
              Try<string> mount = os::shell(

     
···

       482
       464
        
                  bindMountRoot->c_str(),

     

       483
       465
        
                  bindMountRoot->c_str());

     

       484
       466
        
        

     

       485
       485
       -
       @@ -1964,8 +1964,8 @@ Try<Isolator*> PortMappingIsolatorProcess::create(const Flags& flags)

     

       467
       467
       +
       @@ -1979,8 +1979,8 @@ Try<Isolator*> PortMappingIsolatorProcess::create(const Flags& flags)

     

       486
       468
        
                  // so that they are in different peer groups.

     

       487
       469
        
                  if (entry.shared() == bindMountEntry->shared()) {

     

       488
       470
        
                    Try<string> mount = os::shell(

     
···

       493
       475
        
                        bindMountRoot->c_str(),

     

       494
       476
        
                        bindMountRoot->c_str());

     

       495
       477
        
        

     

       496
       496
       -
       @@ -3911,6 +3911,8 @@ Try<Nothing> PortMappingIsolatorProcess::removeHostIPFilters(

     

       478
       478
       +
       @@ -3927,6 +3927,8 @@ Try<Nothing> PortMappingIsolatorProcess::removeHostIPFilters(

     

       497
       479
        
        // TODO(jieyu): Use the Subcommand abstraction to remove most of the

     

       498
       480
        
        // logic here. Completely remove this function once we can assume a

     

       499
       481
        
        // newer kernel where 'setns' works for mount namespaces.

     
···

       502
       484
        
        string PortMappingIsolatorProcess::scripts(Info* info)

     

       503
       485
        
        {

     

       504
       486
        
          ostringstream script;

     

       505
       505
       -
       @@ -3921,7 +3923,7 @@ string PortMappingIsolatorProcess::scripts(Info* info)

     

       487
       487
       +
       @@ -3937,7 +3939,7 @@ string PortMappingIsolatorProcess::scripts(Info* info)

     

       506
       488
        
          // Mark the mount point PORT_MAPPING_BIND_MOUNT_ROOT() as slave

     

       507
       489
        
          // mount so that changes in the container will not be propagated to

     

       508
       490
        
          // the host.

     
···

       511
       493
        
        

     

       512
       494
        
          // Disable IPv6 when IPv6 module is loaded as IPv6 packets won't be

     

       513
       495
        
          // forwarded anyway.

     

       514
       514
       -
       @@ -3929,7 +3931,7 @@ string PortMappingIsolatorProcess::scripts(Info* info)

     

       496
       496
       +
       @@ -3945,7 +3947,7 @@ string PortMappingIsolatorProcess::scripts(Info* info)

     

       515
       497
        
                 << " echo 1 > /proc/sys/net/ipv6/conf/all/disable_ipv6\n";

     

       516
       498
        
        

     

       517
       499
        
          // Configure lo and eth0.

     
···

       520
       502
        
                 << " mtu " << hostEth0MTU << " up\n";

     

       521
       503
        
        

     

       522
       504
        
          // NOTE: This is mostly a kernel issue: in veth_xmit() the kernel

     

       523
       523
       -
       @@ -3938,12 +3940,12 @@ string PortMappingIsolatorProcess::scripts(Info* info)

     

       505
       505
       +
       @@ -3954,12 +3956,12 @@ string PortMappingIsolatorProcess::scripts(Info* info)

     

       524
       506
        
          // when we receive a packet with a bad checksum. Disabling rx

     

       525
       507
        
          // checksum offloading ensures the TCP layer will checksum and drop

     

       526
       508
        
          // it.

     
···

       537
       519
        
        

     

       538
       520
        
          // Restrict the ephemeral ports that can be used by the container.

     

       539
       521
        
          script << "echo " << info->ephemeralPorts.lower() << " "

     

       540
       540
       -
       @@ -3972,19 +3974,19 @@ string PortMappingIsolatorProcess::scripts(Info* info)

     

       522
       522
       +
       @@ -3988,19 +3990,19 @@ string PortMappingIsolatorProcess::scripts(Info* info)

     

       541
       523
        
          }

     

       542
       524
        
        

     

       543
       525
        
          // Set up filters on lo and eth0.

     
···

       561
       543
        
                 << " protocol ip"

     

       562
       544
        
                 << " prio " << Priority(IP_FILTER_PRIORITY, NORMAL).get() << " u32"

     

       563
       545
        
                 << " flowid ffff:0"

     

       564
       564
       -
       @@ -3995,7 +3997,7 @@ string PortMappingIsolatorProcess::scripts(Info* info)

     

       546
       546
       +
       @@ -4011,7 +4013,7 @@ string PortMappingIsolatorProcess::scripts(Info* info)

     

       565
       547
        
          foreach (const PortRange& range,

     

       566
       548
        
                   getPortRanges(info->nonEphemeralPorts + info->ephemeralPorts)) {

     

       567
       549
        
            // Local traffic inside a container will not be redirected to eth0.

     
···

       570
       552
        
                   << " protocol ip"

     

       571
       553
        
                   << " prio " << Priority(IP_FILTER_PRIORITY, HIGH).get() << " u32"

     

       572
       554
        
                   << " flowid ffff:0"

     

       573
       573
       -
       @@ -4004,7 +4006,7 @@ string PortMappingIsolatorProcess::scripts(Info* info)

     

       555
       555
       +
       @@ -4020,7 +4022,7 @@ string PortMappingIsolatorProcess::scripts(Info* info)

     

       574
       556
        
        

     

       575
       557
        
            // Traffic going to host loopback IP and ports assigned to this

     

       576
       558
        
            // container will be redirected to lo.

     
···

       579
       561
        
                   << " protocol ip"

     

       580
       562
        
                   << " prio " << Priority(IP_FILTER_PRIORITY, NORMAL).get() << " u32"

     

       581
       563
        
                   << " flowid ffff:0"

     

       582
       582
       -
       @@ -4016,14 +4018,14 @@ string PortMappingIsolatorProcess::scripts(Info* info)

     

       564
       564
       +
       @@ -4032,14 +4034,14 @@ string PortMappingIsolatorProcess::scripts(Info* info)

     

       583
       565
        
          }

     

       584
       566
        
        

     

       585
       567
        
          // Do not forward the ICMP packet if the destination IP is self.

     
···

       596
       578
        
                 << " protocol ip"

     

       597
       579
        
                 << " prio " << Priority(ICMP_FILTER_PRIORITY, NORMAL).get() << " u32"

     

       598
       580
        
                 << " flowid ffff:0"

     

       599
       599
       -
       @@ -4032,9 +4034,9 @@ string PortMappingIsolatorProcess::scripts(Info* info)

     

       600
       600
       -
                 << net::IPNetwork::LOOPBACK_V4().address() << "\n";

     

       581
       581
       +
       @@ -4048,9 +4050,9 @@ string PortMappingIsolatorProcess::scripts(Info* info)

     

       582
       582
       +
                 << net::IP::Network::LOOPBACK_V4().address() << "\n";

     

       601
       583
        
        

     

       602
       584
        
          // Display the filters created on eth0 and lo.

     

       603
       585
        
       -  script << "tc filter show dev " << eth0

     
···

       608
       590
        
                 << " parent " << ingress::HANDLE << "\n";

     

       609
       591
        
        

     

       610
       592
        
          // If throughput limit for container egress traffic exists, use HTB

     

       611
       611
       -
       @@ -4046,9 +4048,9 @@ string PortMappingIsolatorProcess::scripts(Info* info)

     

       593
       593
       +
       @@ -4062,9 +4064,9 @@ string PortMappingIsolatorProcess::scripts(Info* info)

     

       612
       594
        
          // throughput. TBF requires other parameters such as 'burst' that

     

       613
       595
        
          // HTB already has default values for.

     

       614
       596
        
          if (egressRateLimitPerContainer.isSome()) {

     
···

       620
       602
        
                   << CONTAINER_TX_HTB_HANDLE << " classid "

     

       621
       603
        
                   << CONTAINER_TX_HTB_CLASS_ID << " htb rate "

     

       622
       604
        
                   << egressRateLimitPerContainer.get().bytes() * 8 << "bit\n";

     

       623
       623
       -
       @@ -4059,12 +4061,12 @@ string PortMappingIsolatorProcess::scripts(Info* info)

     

       605
       605
       +
       @@ -4075,12 +4077,12 @@ string PortMappingIsolatorProcess::scripts(Info* info)

     

       624
       606
        
            // fq_codel, which has a larger buffer and better control on

     

       625
       607
        
            // buffer bloat.

     

       626
       608
        
            // TODO(cwang): Verity that fq_codel qdisc is available.

     
···

       636
       618
        
          }

     

       637
       619
        
        

     

       638
       620
        
          return script.str();

     

       639
       639
       -
       diff --git a/src/slave/containerizer/mesos/isolators/posix/disk.cpp b/src/slave/containerizer/mesos/isolators/posix/disk.cpp

     

       640
       640
       -
       index db0583386..542586370 100644

     

       641
       641
       -
       --- a/src/slave/containerizer/mesos/isolators/posix/disk.cpp

     

       642
       642
       -
       +++ b/src/slave/containerizer/mesos/isolators/posix/disk.cpp

     

       643
       643
       -
       @@ -540,7 +540,7 @@ private:

     

       621
       621
       +
       diff --git i/src/slave/containerizer/mesos/isolators/posix/disk.cpp w/src/slave/containerizer/mesos/isolators/posix/disk.cpp

     

       622
       622
       +
       index eb23025..db268ea 100644

     

       623
       623
       +
       --- i/src/slave/containerizer/mesos/isolators/posix/disk.cpp

     

       624
       624
       +
       +++ w/src/slave/containerizer/mesos/isolators/posix/disk.cpp

     

       625
       625
       +
       @@ -572,7 +572,7 @@ private:

     

       644
       626
        
            // NOTE: The supervisor childhook will watch the parent process and kill

     

       645
       627
        
            // the 'du' process in case that the parent die.

     

       646
       628
        
            Try<Subprocess> s = subprocess(

     

       647
       629
        
       -        "du",

     

       648
       630
        
       +        "@du@",

     

       649
       631
        
                command,

     

       650
       650
       -
                Subprocess::PATH("/dev/null"),

     

       632
       632
       +
                Subprocess::PATH(os::DEV_NULL),

     

       651
       633
        
                Subprocess::PIPE(),

     

       652
       652
       -
       diff --git a/src/slave/containerizer/mesos/isolators/volume/image.cpp b/src/slave/containerizer/mesos/isolators/volume/image.cpp

     

       653
       653
       -
       index 210e67ad0..60b3a15e4 100644

     

       654
       654
       -
       --- a/src/slave/containerizer/mesos/isolators/volume/image.cpp

     

       655
       655
       -
       +++ b/src/slave/containerizer/mesos/isolators/volume/image.cpp

     

       656
       656
       -
       @@ -214,7 +214,7 @@ Future<Option<ContainerLaunchInfo>> VolumeImageIsolatorProcess::_prepare(

     

       634
       634
       +
       diff --git i/src/slave/containerizer/mesos/isolators/volume/image.cpp w/src/slave/containerizer/mesos/isolators/volume/image.cpp

     

       635
       635
       +
       index 35966aa..b62fc86 100644

     

       636
       636
       +
       --- i/src/slave/containerizer/mesos/isolators/volume/image.cpp

     

       637
       637
       +
       +++ w/src/slave/containerizer/mesos/isolators/volume/image.cpp

     

       638
       638
       +
       @@ -231,7 +231,7 @@ Future<Option<ContainerLaunchInfo>> VolumeImageIsolatorProcess::_prepare(

     

       657
       639
        
        

     

       658
       640
        
            CommandInfo* command = launchInfo.add_pre_exec_commands();

     

       659
       641
        
            command->set_shell(false);

     
···

       662
       644
        
            command->add_arguments("mount");

     

       663
       645
        
            command->add_arguments("-n");

     

       664
       646
        
            command->add_arguments("--rbind");

     

       665
       665
       -
       diff --git a/src/slave/containerizer/mesos/isolators/volume/sandbox_path.cpp b/src/slave/containerizer/mesos/isolators/volume/sandbox_path.cpp

     

       666
       666
       -
       index 7b976d292..474dcd486 100644

     

       667
       667
       -
       --- a/src/slave/containerizer/mesos/isolators/volume/sandbox_path.cpp

     

       668
       668
       -
       +++ b/src/slave/containerizer/mesos/isolators/volume/sandbox_path.cpp

     

       669
       669
       -
       @@ -240,7 +240,7 @@ Future<Option<ContainerLaunchInfo>> VolumeSandboxPathIsolatorProcess::prepare(

     

       647
       647
       +
       diff --git i/src/slave/containerizer/mesos/isolators/volume/sandbox_path.cpp w/src/slave/containerizer/mesos/isolators/volume/sandbox_path.cpp

     

       648
       648
       +
       index b321b86..8ed3e78 100644

     

       649
       649
       +
       --- i/src/slave/containerizer/mesos/isolators/volume/sandbox_path.cpp

     

       650
       650
       +
       +++ w/src/slave/containerizer/mesos/isolators/volume/sandbox_path.cpp

     

       651
       651
       +
       @@ -265,7 +265,7 @@ Future<Option<ContainerLaunchInfo>> VolumeSandboxPathIsolatorProcess::prepare(

     

       670
       652
        
        

     

       671
       653
        
              CommandInfo* command = launchInfo.add_pre_exec_commands();

     

       672
       654
        
              command->set_shell(false);

     
···

       675
       657
        
              command->add_arguments("mount");

     

       676
       658
        
              command->add_arguments("-n");

     

       677
       659
        
              command->add_arguments("--rbind");

     

       678
       678
       -
       diff --git a/src/slave/containerizer/mesos/provisioner/backends/copy.cpp b/src/slave/containerizer/mesos/provisioner/backends/copy.cpp

     

       679
       679
       -
       index 9c5354e5f..a73a9692e 100644

     

       680
       680
       -
       --- a/src/slave/containerizer/mesos/provisioner/backends/copy.cpp

     

       681
       681
       -
       +++ b/src/slave/containerizer/mesos/provisioner/backends/copy.cpp

     

       682
       682
       -
       @@ -147,7 +147,7 @@ Future<Nothing> CopyBackendProcess::_provision(

     

       660
       660
       +
       diff --git i/src/slave/containerizer/mesos/provisioner/backends/copy.cpp w/src/slave/containerizer/mesos/provisioner/backends/copy.cpp

     

       661
       661
       +
       index 69faa03..01a3ed6 100644

     

       662
       662
       +
       --- i/src/slave/containerizer/mesos/provisioner/backends/copy.cpp

     

       663
       663
       +
       +++ w/src/slave/containerizer/mesos/provisioner/backends/copy.cpp

     

       664
       664
       +
       @@ -266,7 +266,7 @@ Future<Nothing> CopyBackendProcess::_provision(

     

       683
       665
        
        #endif // __APPLE__ || __FreeBSD__

     

       684
       666
        
        

     

       685
       667
        
          Try<Subprocess> s = subprocess(

     

       686
       668
        
       -      "cp",

     

       687
       669
        
       +      "@cp@",

     

       688
       670
        
              args,

     

       689
       689
       -
              Subprocess::PATH("/dev/null"),

     

       690
       690
       -
              Subprocess::PATH("/dev/null"),

     

       691
       691
       -
       @@ -180,7 +180,7 @@ Future<bool> CopyBackendProcess::destroy(const string& rootfs)

     

       671
       671
       +
              Subprocess::PATH(os::DEV_NULL),

     

       672
       672
       +
              Subprocess::PATH(os::DEV_NULL),

     

       673
       673
       +
       @@ -313,7 +313,7 @@ Future<bool> CopyBackendProcess::destroy(const string& rootfs)

     

       692
       674
        
          vector<string> argv{"rm", "-rf", rootfs};

     

       693
       675
        
        

     

       694
       676
        
          Try<Subprocess> s = subprocess(

     

       695
       677
        
       -      "rm",

     

       696
       678
        
       +      "@rm@",

     

       697
       679
        
              argv,

     

       698
       698
       -
              Subprocess::PATH("/dev/null"),

     

       680
       680
       +
              Subprocess::PATH(os::DEV_NULL),

     

       699
       681
        
              Subprocess::FD(STDOUT_FILENO),

     

       700
       700
       -
       diff --git a/src/uri/fetchers/copy.cpp b/src/uri/fetchers/copy.cpp

     

       701
       701
       -
       index 2cfef5ab0..8a62f7699 100644

     

       702
       702
       -
       --- a/src/uri/fetchers/copy.cpp

     

       703
       703
       -
       +++ b/src/uri/fetchers/copy.cpp

     

       704
       704
       -
       @@ -97,7 +97,7 @@ Future<Nothing> CopyFetcherPlugin::fetch(

     

       705
       705
       -
          const vector<string> argv = {"cp", "-a", uri.path(), directory};

     

       682
       682
       +
       diff --git i/src/uri/fetchers/copy.cpp w/src/uri/fetchers/copy.cpp

     

       683
       683
       +
       index 17f69be..831b08a 100644

     

       684
       684
       +
       --- i/src/uri/fetchers/copy.cpp

     

       685
       685
       +
       +++ w/src/uri/fetchers/copy.cpp

     

       686
       686
       +
       @@ -97,8 +97,8 @@ Future<Nothing> CopyFetcherPlugin::fetch(

     

       687
       687
       +
          VLOG(1) << "Copying '" << uri.path() << "' to '" << directory << "'";

     

       706
       688
        
        

     

       707
       707
       -
          Try<Subprocess> s = subprocess(

     

       708
       708
       -
       -      "cp",

     

       709
       709
       -
       +      "@cp@",

     

       710
       710
       -
              argv,

     

       711
       711
       -
              Subprocess::PATH("/dev/null"),

     

       712
       712
       -
              Subprocess::PIPE(),

     

       713
       713
       -
       diff --git a/src/uri/fetchers/curl.cpp b/src/uri/fetchers/curl.cpp

     

       714
       714
       -
       index 7b746d619..12bbb04df 100644

     

       715
       715
       -
       --- a/src/uri/fetchers/curl.cpp

     

       716
       716
       -
       +++ b/src/uri/fetchers/curl.cpp

     

       717
       717
       -
       @@ -107,7 +107,7 @@ Future<Nothing> CurlFetcherPlugin::fetch(

     

       689
       689
       +
        #ifndef __WINDOWS__

     

       690
       690
       +
       -  const char* copyCommand = "cp";

     

       691
       691
       +
       -  const vector<string> argv = {"cp", "-a", uri.path(), directory};

     

       692
       692
       +
       +  const char* copyCommand = "@cp@";

     

       693
       693
       +
       +  const vector<string> argv = {"@cp@", "-a", uri.path(), directory};

     

       694
       694
       +
        #else // __WINDOWS__

     

       695
       695
       +
          const char* copyCommand = os::Shell::name;

     

       696
       696
       +
          const vector<string> argv =

     

       697
       697
       +
       diff --git i/src/uri/fetchers/curl.cpp w/src/uri/fetchers/curl.cpp

     

       698
       698
       +
       index f34daf2..6a50341 100644

     

       699
       699
       +
       --- i/src/uri/fetchers/curl.cpp

     

       700
       700
       +
       +++ w/src/uri/fetchers/curl.cpp

     

       701
       701
       +
       @@ -109,7 +109,7 @@ Future<Nothing> CurlFetcherPlugin::fetch(

     

       718
       702
        
          };

     

       719
       703
        
        

     

       720
       704
        
          Try<Subprocess> s = subprocess(

     

       721
       705
        
       -      "curl",

     

       722
       706
        
       +      "@curl@",

     

       723
       707
        
              argv,

     

       724
       724
       -
              Subprocess::PATH("/dev/null"),

     

       708
       708
       +
              Subprocess::PATH(os::DEV_NULL),

     

       725
       709
        
              Subprocess::PIPE(),

     

       726
       726
       -
       diff --git a/src/uri/fetchers/docker.cpp b/src/uri/fetchers/docker.cpp

     

       727
       727
       -
       index 3f38dddfb..fd991ee74 100644

     

       728
       728
       -
       --- a/src/uri/fetchers/docker.cpp

     

       729
       729
       -
       +++ b/src/uri/fetchers/docker.cpp

     

       710
       710
       +
       diff --git i/src/uri/fetchers/docker.cpp w/src/uri/fetchers/docker.cpp

     

       711
       711
       +
       index 91db13b..82a7fc4 100644

     

       712
       712
       +
       --- i/src/uri/fetchers/docker.cpp

     

       713
       713
       +
       +++ w/src/uri/fetchers/docker.cpp

     

       730
       714
        
       @@ -114,7 +114,7 @@ static Future<http::Response> curl(

     

       731
       715
        
        

     

       732
       716
        
          // TODO(jieyu): Kill the process if discard is called.

     
···

       734
       718
        
       -      "curl",

     

       735
       719
        
       +      "@curl@",

     

       736
       720
        
              argv,

     

       737
       737
       -
              Subprocess::PATH("/dev/null"),

     

       721
       721
       +
              Subprocess::PATH(os::DEV_NULL),

     

       738
       722
        
              Subprocess::PIPE(),

     

       739
       739
       -
       @@ -213,7 +213,7 @@ static Future<int> download(

     

       723
       723
       +
       @@ -229,7 +229,7 @@ static Future<int> download(

     

       740
       724
        
        

     

       741
       725
        
          // TODO(jieyu): Kill the process if discard is called.

     

       742
       726
        
          Try<Subprocess> s = subprocess(

     

       743
       727
        
       -      "curl",

     

       744
       728
        
       +      "@curl@",

     

       745
       729
        
              argv,

     

       746
       746
       -
              Subprocess::PATH("/dev/null"),

     

       730
       730
       +
              Subprocess::PATH(os::DEV_NULL),

     

       747
       731
        
              Subprocess::PIPE(),