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 2015/12/30 07:43:36 UTC
mesos git commit: A few style fixes for Docker provisioner store.
Repository: mesos
Updated Branches:
refs/heads/master 5f6b1032c -> 5386eaec0
A few style fixes for Docker provisioner store.
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/5386eaec
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/5386eaec
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/5386eaec
Branch: refs/heads/master
Commit: 5386eaec00f71826b553ec1b142a6f08c8117aaf
Parents: 5f6b103
Author: Jie Yu <yu...@gmail.com>
Authored: Tue Dec 29 15:25:02 2015 -0800
Committer: Jie Yu <yu...@gmail.com>
Committed: Tue Dec 29 22:42:55 2015 -0800
----------------------------------------------------------------------
.../mesos/provisioner/docker/store.cpp | 31 ++++++++------------
.../mesos/provisioner/docker/store.hpp | 14 ++++-----
2 files changed, 19 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/5386eaec/src/slave/containerizer/mesos/provisioner/docker/store.cpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/mesos/provisioner/docker/store.cpp b/src/slave/containerizer/mesos/provisioner/docker/store.cpp
index e951c96..03425da 100644
--- a/src/slave/containerizer/mesos/provisioner/docker/store.cpp
+++ b/src/slave/containerizer/mesos/provisioner/docker/store.cpp
@@ -14,8 +14,6 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "slave/containerizer/mesos/provisioner/docker/store.hpp"
-
#include <list>
#include <vector>
@@ -24,7 +22,6 @@
#include <stout/hashmap.hpp>
#include <stout/json.hpp>
#include <stout/os.hpp>
-#include <stout/result.hpp>
#include <process/collect.hpp>
#include <process/defer.hpp>
@@ -34,11 +31,10 @@
#include "common/status_utils.hpp"
#include "slave/containerizer/mesos/provisioner/docker/metadata_manager.hpp"
+#include "slave/containerizer/mesos/provisioner/docker/store.hpp"
#include "slave/containerizer/mesos/provisioner/docker/paths.hpp"
#include "slave/containerizer/mesos/provisioner/docker/puller.hpp"
-#include "slave/flags.hpp"
-
using namespace process;
using std::list;
@@ -58,7 +54,9 @@ public:
const Flags& _flags,
const Owned<MetadataManager>& _metadataManager,
const Owned<Puller>& _puller)
- : flags(_flags), metadataManager(_metadataManager), puller(_puller) {}
+ : flags(_flags),
+ metadataManager(_metadataManager),
+ puller(_puller) {}
~StoreProcess() {}
@@ -67,10 +65,7 @@ public:
Future<ImageInfo> get(const mesos::Image& image);
private:
- Future<Image> _get(
- const Image::Name& name,
- const Option<Image>& image);
-
+ Future<Image> _get(const Image::Name& name, const Option<Image>& image);
Future<ImageInfo> __get(const Image& image);
Future<vector<string>> moveLayers(
@@ -136,14 +131,14 @@ Try<Owned<slave::Store>> Store::create(
Store::Store(const Owned<StoreProcess>& _process) : process(_process)
{
- process::spawn(CHECK_NOTNULL(process.get()));
+ spawn(CHECK_NOTNULL(process.get()));
}
Store::~Store()
{
- process::terminate(process.get());
- process::wait(process.get());
+ terminate(process.get());
+ wait(process.get());
}
@@ -251,12 +246,12 @@ Future<vector<string>> StoreProcess::moveLayers(
return collect(futures)
.then([layerPaths]() {
- vector<string> layerIds;
- foreach (const auto& layerPath, layerPaths) {
- layerIds.push_back(layerPath.first);
- }
+ vector<string> layerIds;
+ foreach (const auto& layerPath, layerPaths) {
+ layerIds.push_back(layerPath.first);
+ }
- return layerIds;
+ return layerIds;
});
}
http://git-wip-us.apache.org/repos/asf/mesos/blob/5386eaec/src/slave/containerizer/mesos/provisioner/docker/store.hpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/mesos/provisioner/docker/store.hpp b/src/slave/containerizer/mesos/provisioner/docker/store.hpp
index 83cad39..880e216 100644
--- a/src/slave/containerizer/mesos/provisioner/docker/store.hpp
+++ b/src/slave/containerizer/mesos/provisioner/docker/store.hpp
@@ -17,16 +17,14 @@
#ifndef __PROVISIONER_DOCKER_STORE_HPP__
#define __PROVISIONER_DOCKER_STORE_HPP__
-#include <string>
+#include <process/owned.hpp>
#include <stout/try.hpp>
-#include <process/future.hpp>
+#include "slave/flags.hpp"
#include "slave/containerizer/mesos/provisioner/store.hpp"
-#include "slave/flags.hpp"
-
namespace mesos {
namespace internal {
namespace slave {
@@ -48,14 +46,14 @@ public:
const Flags& flags,
const process::Owned<Puller>& puller);
- ~Store();
+ virtual ~Store();
- process::Future<Nothing> recover();
+ virtual process::Future<Nothing> recover();
- process::Future<ImageInfo> get(const mesos::Image& image);
+ virtual process::Future<ImageInfo> get(const mesos::Image& image);
private:
- explicit Store(const process::Owned<StoreProcess>& _process);
+ explicit Store(const process::Owned<StoreProcess>& process);
Store& operator=(const Store&) = delete; // Not assignable.
Store(const Store&) = delete; // Not copyable.