You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by bm...@apache.org on 2018/07/05 22:20:42 UTC
[1/2] mesos git commit: Fixed recover() virtual method signature in
several isolators.
Repository: mesos
Updated Branches:
refs/heads/master bf69856f2 -> 16455857e
Fixed recover() virtual method signature in several isolators.
Commit a52e5288ea94ec7d84f82c6c01c1ce3c7a3902db replaced std::list with
std::vector in several places including the Isolator interface. However
XfsDiskIsolatorProcess, PortMappingIsolatorProcess and
NetworkPortsIsolatorProcess were not updated and because of that their
recover() method became "disabled".
Review: https://reviews.apache.org/r/67820/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/ea38d7e0
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/ea38d7e0
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/ea38d7e0
Branch: refs/heads/master
Commit: ea38d7e03c029437bc655b598a33863f53e8e1ff
Parents: bf69856
Author: Ilya Pronin <ip...@twopensource.com>
Authored: Thu Jul 5 15:19:50 2018 -0700
Committer: Benjamin Mahler <bm...@apache.org>
Committed: Thu Jul 5 15:19:50 2018 -0700
----------------------------------------------------------------------
src/slave/containerizer/mesos/isolators/network/port_mapping.cpp | 2 +-
src/slave/containerizer/mesos/isolators/network/port_mapping.hpp | 2 +-
src/slave/containerizer/mesos/isolators/network/ports.cpp | 2 +-
src/slave/containerizer/mesos/isolators/network/ports.hpp | 2 +-
src/slave/containerizer/mesos/isolators/xfs/disk.cpp | 3 ++-
src/slave/containerizer/mesos/isolators/xfs/disk.hpp | 2 +-
6 files changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/ea38d7e0/src/slave/containerizer/mesos/isolators/network/port_mapping.cpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/mesos/isolators/network/port_mapping.cpp b/src/slave/containerizer/mesos/isolators/network/port_mapping.cpp
index 3f51542..a29282e 100644
--- a/src/slave/containerizer/mesos/isolators/network/port_mapping.cpp
+++ b/src/slave/containerizer/mesos/isolators/network/port_mapping.cpp
@@ -2039,7 +2039,7 @@ Try<Isolator*> PortMappingIsolatorProcess::create(const Flags& flags)
Future<Nothing> PortMappingIsolatorProcess::recover(
- const list<ContainerState>& states,
+ const vector<ContainerState>& states,
const hashset<ContainerID>& orphans)
{
// Extract pids from virtual device names (veth). This tells us
http://git-wip-us.apache.org/repos/asf/mesos/blob/ea38d7e0/src/slave/containerizer/mesos/isolators/network/port_mapping.hpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/mesos/isolators/network/port_mapping.hpp b/src/slave/containerizer/mesos/isolators/network/port_mapping.hpp
index 6ff3820..8d46ba5 100644
--- a/src/slave/containerizer/mesos/isolators/network/port_mapping.hpp
+++ b/src/slave/containerizer/mesos/isolators/network/port_mapping.hpp
@@ -152,7 +152,7 @@ public:
virtual ~PortMappingIsolatorProcess() {}
virtual process::Future<Nothing> recover(
- const std::list<mesos::slave::ContainerState>& states,
+ const std::vector<mesos::slave::ContainerState>& states,
const hashset<ContainerID>& orphans);
virtual process::Future<Option<mesos::slave::ContainerLaunchInfo>> prepare(
http://git-wip-us.apache.org/repos/asf/mesos/blob/ea38d7e0/src/slave/containerizer/mesos/isolators/network/ports.cpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/mesos/isolators/network/ports.cpp b/src/slave/containerizer/mesos/isolators/network/ports.cpp
index 82c1441..2a7ff25 100644
--- a/src/slave/containerizer/mesos/isolators/network/ports.cpp
+++ b/src/slave/containerizer/mesos/isolators/network/ports.cpp
@@ -397,7 +397,7 @@ static bool hasNamedNetwork(const ContainerInfo& container_info)
// so we must not start isolating it until we receive the resources
// update.
Future<Nothing> NetworkPortsIsolatorProcess::recover(
- const list<ContainerState>& states,
+ const vector<ContainerState>& states,
const hashset<ContainerID>& orphans)
{
// First, recover all the root level containers.
http://git-wip-us.apache.org/repos/asf/mesos/blob/ea38d7e0/src/slave/containerizer/mesos/isolators/network/ports.hpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/mesos/isolators/network/ports.hpp b/src/slave/containerizer/mesos/isolators/network/ports.hpp
index 8d467ce..7e7a757 100644
--- a/src/slave/containerizer/mesos/isolators/network/ports.hpp
+++ b/src/slave/containerizer/mesos/isolators/network/ports.hpp
@@ -57,7 +57,7 @@ public:
virtual bool supportsNesting();
virtual process::Future<Nothing> recover(
- const std::list<mesos::slave::ContainerState>& states,
+ const std::vector<mesos::slave::ContainerState>& states,
const hashset<ContainerID>& orphans);
virtual process::Future<Option<mesos::slave::ContainerLaunchInfo>> prepare(
http://git-wip-us.apache.org/repos/asf/mesos/blob/ea38d7e0/src/slave/containerizer/mesos/isolators/xfs/disk.cpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/mesos/isolators/xfs/disk.cpp b/src/slave/containerizer/mesos/isolators/xfs/disk.cpp
index 362996b..25f52a4 100644
--- a/src/slave/containerizer/mesos/isolators/xfs/disk.cpp
+++ b/src/slave/containerizer/mesos/isolators/xfs/disk.cpp
@@ -35,6 +35,7 @@
using std::list;
using std::string;
+using std::vector;
using process::Failure;
using process::Future;
@@ -198,7 +199,7 @@ XfsDiskIsolatorProcess::~XfsDiskIsolatorProcess() {}
Future<Nothing> XfsDiskIsolatorProcess::recover(
- const list<ContainerState>& states,
+ const vector<ContainerState>& states,
const hashset<ContainerID>& orphans)
{
// We don't need to explicitly deal with orphans since we are primarily
http://git-wip-us.apache.org/repos/asf/mesos/blob/ea38d7e0/src/slave/containerizer/mesos/isolators/xfs/disk.hpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/mesos/isolators/xfs/disk.hpp b/src/slave/containerizer/mesos/isolators/xfs/disk.hpp
index 9a5ca8b..e64a779 100644
--- a/src/slave/containerizer/mesos/isolators/xfs/disk.hpp
+++ b/src/slave/containerizer/mesos/isolators/xfs/disk.hpp
@@ -48,7 +48,7 @@ public:
}
virtual process::Future<Nothing> recover(
- const std::list<mesos::slave::ContainerState>& states,
+ const std::vector<mesos::slave::ContainerState>& states,
const hashset<ContainerID>& orphans);
virtual process::Future<Option<mesos::slave::ContainerLaunchInfo>> prepare(
[2/2] mesos git commit: Added override specifiers to virtual methods
of several isolators.
Posted by bm...@apache.org.
Added override specifiers to virtual methods of several isolators.
This is a follow-up change for disk/xfs, network/port_mapping and
network/ports isolators to avoid problems with virtual method signatures
in the future.
Review: https://reviews.apache.org/r/67821/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/16455857
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/16455857
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/16455857
Branch: refs/heads/master
Commit: 16455857ee00e98147d8cb9fb6f31b22554dfe52
Parents: ea38d7e
Author: Ilya Pronin <ip...@twopensource.com>
Authored: Thu Jul 5 15:20:33 2018 -0700
Committer: Benjamin Mahler <bm...@apache.org>
Committed: Thu Jul 5 15:20:33 2018 -0700
----------------------------------------------------------------------
.../mesos/isolators/network/port_mapping.hpp | 38 ++++++++++----------
.../mesos/isolators/network/ports.hpp | 26 +++++++-------
.../containerizer/mesos/isolators/xfs/disk.hpp | 28 +++++++--------
3 files changed, 46 insertions(+), 46 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/16455857/src/slave/containerizer/mesos/isolators/network/port_mapping.hpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/mesos/isolators/network/port_mapping.hpp b/src/slave/containerizer/mesos/isolators/network/port_mapping.hpp
index 8d46ba5..c14a8cc 100644
--- a/src/slave/containerizer/mesos/isolators/network/port_mapping.hpp
+++ b/src/slave/containerizer/mesos/isolators/network/port_mapping.hpp
@@ -149,32 +149,32 @@ class PortMappingIsolatorProcess : public MesosIsolatorProcess
public:
static Try<mesos::slave::Isolator*> create(const Flags& flags);
- virtual ~PortMappingIsolatorProcess() {}
+ ~PortMappingIsolatorProcess() override {}
- virtual process::Future<Nothing> recover(
+ process::Future<Nothing> recover(
const std::vector<mesos::slave::ContainerState>& states,
- const hashset<ContainerID>& orphans);
+ const hashset<ContainerID>& orphans) override;
- virtual process::Future<Option<mesos::slave::ContainerLaunchInfo>> prepare(
+ process::Future<Option<mesos::slave::ContainerLaunchInfo>> prepare(
const ContainerID& containerId,
- const mesos::slave::ContainerConfig& containerConfig);
+ const mesos::slave::ContainerConfig& containerConfig) override;
- virtual process::Future<Nothing> isolate(
+ process::Future<Nothing> isolate(
const ContainerID& containerId,
- pid_t pid);
+ pid_t pid) override;
- virtual process::Future<mesos::slave::ContainerLimitation> watch(
- const ContainerID& containerId);
+ process::Future<mesos::slave::ContainerLimitation> watch(
+ const ContainerID& containerId) override;
- virtual process::Future<Nothing> update(
+ process::Future<Nothing> update(
const ContainerID& containerId,
- const Resources& resources);
+ const Resources& resources) override;
- virtual process::Future<ResourceStatistics> usage(
- const ContainerID& containerId);
+ process::Future<ResourceStatistics> usage(
+ const ContainerID& containerId) override;
- virtual process::Future<Nothing> cleanup(
- const ContainerID& containerId);
+ process::Future<Nothing> cleanup(
+ const ContainerID& containerId) override;
private:
struct Info
@@ -368,8 +368,8 @@ public:
Flags flags;
protected:
- virtual int execute();
- virtual flags::FlagsBase* getFlags() { return &flags; }
+ int execute() override;
+ flags::FlagsBase* getFlags() override { return &flags; }
};
@@ -397,8 +397,8 @@ public:
Flags flags;
protected:
- virtual int execute();
- virtual flags::FlagsBase* getFlags() { return &flags; }
+ int execute() override;
+ flags::FlagsBase* getFlags() override { return &flags; }
};
} // namespace slave {
http://git-wip-us.apache.org/repos/asf/mesos/blob/16455857/src/slave/containerizer/mesos/isolators/network/ports.hpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/mesos/isolators/network/ports.hpp b/src/slave/containerizer/mesos/isolators/network/ports.hpp
index 7e7a757..6944d01 100644
--- a/src/slave/containerizer/mesos/isolators/network/ports.hpp
+++ b/src/slave/containerizer/mesos/isolators/network/ports.hpp
@@ -52,34 +52,34 @@ public:
static Try<mesos::slave::Isolator*> create(const Flags& flags);
- virtual ~NetworkPortsIsolatorProcess() {}
+ ~NetworkPortsIsolatorProcess() override {}
- virtual bool supportsNesting();
+ bool supportsNesting() override;
- virtual process::Future<Nothing> recover(
+ process::Future<Nothing> recover(
const std::vector<mesos::slave::ContainerState>& states,
- const hashset<ContainerID>& orphans);
+ const hashset<ContainerID>& orphans) override;
- virtual process::Future<Option<mesos::slave::ContainerLaunchInfo>> prepare(
+ process::Future<Option<mesos::slave::ContainerLaunchInfo>> prepare(
const ContainerID& containerId,
- const mesos::slave::ContainerConfig& containerConfig);
+ const mesos::slave::ContainerConfig& containerConfig) override;
- virtual process::Future<mesos::slave::ContainerLimitation> watch(
- const ContainerID& containerId);
+ process::Future<mesos::slave::ContainerLimitation> watch(
+ const ContainerID& containerId) override;
- virtual process::Future<Nothing> update(
+ process::Future<Nothing> update(
const ContainerID& containerId,
- const Resources& resources);
+ const Resources& resources) override;
- virtual process::Future<Nothing> cleanup(
- const ContainerID& containerId);
+ process::Future<Nothing> cleanup(
+ const ContainerID& containerId) override;
// Public only for testing.
process::Future<Nothing> check(
const hashmap<ContainerID, IntervalSet<uint16_t>>& listeners);
protected:
- virtual void initialize();
+ void initialize() override;
private:
NetworkPortsIsolatorProcess(
http://git-wip-us.apache.org/repos/asf/mesos/blob/16455857/src/slave/containerizer/mesos/isolators/xfs/disk.hpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/mesos/isolators/xfs/disk.hpp b/src/slave/containerizer/mesos/isolators/xfs/disk.hpp
index e64a779..0891f77 100644
--- a/src/slave/containerizer/mesos/isolators/xfs/disk.hpp
+++ b/src/slave/containerizer/mesos/isolators/xfs/disk.hpp
@@ -40,36 +40,36 @@ class XfsDiskIsolatorProcess : public MesosIsolatorProcess
public:
static Try<mesos::slave::Isolator*> create(const Flags& flags);
- virtual ~XfsDiskIsolatorProcess();
+ ~XfsDiskIsolatorProcess() override;
process::PID<XfsDiskIsolatorProcess> self() const
{
return process::PID<XfsDiskIsolatorProcess>(this);
}
- virtual process::Future<Nothing> recover(
+ process::Future<Nothing> recover(
const std::vector<mesos::slave::ContainerState>& states,
- const hashset<ContainerID>& orphans);
+ const hashset<ContainerID>& orphans) override;
- virtual process::Future<Option<mesos::slave::ContainerLaunchInfo>> prepare(
+ process::Future<Option<mesos::slave::ContainerLaunchInfo>> prepare(
const ContainerID& containerId,
- const mesos::slave::ContainerConfig& containerConfig);
+ const mesos::slave::ContainerConfig& containerConfig) override;
- virtual process::Future<mesos::slave::ContainerLimitation> watch(
- const ContainerID& containerId);
+ process::Future<mesos::slave::ContainerLimitation> watch(
+ const ContainerID& containerId) override;
- virtual process::Future<Nothing> update(
+ process::Future<Nothing> update(
const ContainerID& containerId,
- const Resources& resources);
+ const Resources& resources) override;
- virtual process::Future<ResourceStatistics> usage(
- const ContainerID& containerId);
+ process::Future<ResourceStatistics> usage(
+ const ContainerID& containerId) override;
- virtual process::Future<Nothing> cleanup(
- const ContainerID& containerId);
+ process::Future<Nothing> cleanup(
+ const ContainerID& containerId) override;
protected:
- virtual void initialize();
+ void initialize() override;
private:
XfsDiskIsolatorProcess(