You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by mp...@apache.org on 2016/08/10 17:58:13 UTC
[2/4] mesos git commit: Trimmed unneeded extra space between right
angle brackets.
Trimmed unneeded extra space between right angle brackets.
Mesos codebase has been evolved and no more need an extra space
between two right angle brackets, e.g. vector<Option<int> >, to
work around C++98 parsing deficiencies (see MESOS-5830).
Review: https://reviews.apache.org/r/50887/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/bea8c3c9
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/bea8c3c9
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/bea8c3c9
Branch: refs/heads/master
Commit: bea8c3c90da4ad0e2c282d238cb9af5dab2e2f72
Parents: 7058960
Author: Gaojin CAO <ca...@cmss.chinamobile.com>
Authored: Wed Aug 10 18:40:21 2016 +0100
Committer: Michael Park <mp...@apache.org>
Committed: Wed Aug 10 18:48:50 2016 +0100
----------------------------------------------------------------------
include/mesos/log/log.hpp | 8 +-
include/mesos/zookeeper/contender.hpp | 2 +-
include/mesos/zookeeper/detector.hpp | 2 +-
src/authentication/cram_md5/auxprop.cpp | 2 +-
src/cli/mesos.cpp | 2 +-
src/cli/resolve.cpp | 2 +-
src/files/files.cpp | 2 +-
src/java/jni/org_apache_mesos_Log.cpp | 8 +-
.../org_apache_mesos_state_AbstractState.cpp | 28 ++---
src/launcher/executor.cpp | 6 +-
src/linux/ns.hpp | 4 +-
src/log/consensus.cpp | 12 +-
src/log/coordinator.cpp | 46 +++----
src/log/coordinator.hpp | 6 +-
src/log/log.cpp | 38 +++---
src/log/main.cpp | 2 +-
src/log/network.hpp | 20 +--
src/log/recover.cpp | 24 ++--
src/log/recover.hpp | 2 +-
src/log/tool/benchmark.cpp | 2 +-
src/master/registrar.cpp | 24 ++--
src/slave/gc.cpp | 2 +-
src/slave/gc.hpp | 4 +-
src/slave/state.cpp | 8 +-
src/slave/status_update_manager.cpp | 2 +-
src/tests/allocator.hpp | 2 +-
src/tests/containerizer.cpp | 2 +-
src/tests/containerizer.hpp | 6 +-
.../composing_containerizer_tests.cpp | 2 +-
.../docker_containerizer_tests.cpp | 34 ++---
src/tests/containerizer/docker_tests.cpp | 2 +-
src/tests/containerizer/isolator_tests.cpp | 16 +--
src/tests/containerizer/launcher.hpp | 2 +-
src/tests/containerizer/port_mapping_tests.cpp | 52 ++++----
src/tests/disk_quota_tests.cpp | 6 +-
src/tests/environment.cpp | 6 +-
src/tests/exception_tests.cpp | 2 +-
src/tests/health_check_tests.cpp | 14 +--
src/tests/master_allocator_tests.cpp | 2 +-
src/tests/master_authorization_tests.cpp | 16 +--
src/tests/master_contender_detector_tests.cpp | 66 +++++-----
src/tests/master_slave_reconciliation_tests.cpp | 10 +-
src/tests/mesos.hpp | 4 +-
src/tests/reconciliation_tests.cpp | 2 +-
src/tests/registrar_tests.cpp | 4 +-
src/tests/registrar_zookeeper_tests.cpp | 2 +-
src/tests/slave_recovery_tests.cpp | 126 +++++++++----------
src/tests/state_tests.cpp | 40 +++---
src/tests/status_update_manager_tests.cpp | 16 +--
src/tests/zookeeper.cpp | 2 +-
src/zookeeper/detector.cpp | 22 ++--
support/cpplint.py | 2 +-
52 files changed, 359 insertions(+), 359 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/bea8c3c9/include/mesos/log/log.hpp
----------------------------------------------------------------------
diff --git a/include/mesos/log/log.hpp b/include/mesos/log/log.hpp
index 0f69848..3edb9f1 100644
--- a/include/mesos/log/log.hpp
+++ b/include/mesos/log/log.hpp
@@ -133,7 +133,7 @@ public:
// Returns all entries between the specified positions, unless
// those positions are invalid, in which case returns an error.
- process::Future<std::list<Entry> > read(
+ process::Future<std::list<Entry>> read(
const Position& from,
const Position& to);
@@ -168,19 +168,19 @@ public:
// perform append and truncate operations. Returns the ending
// position of the log or none if the promise to exclusively write
// could not be attained but may be retried.
- process::Future<Option<Position> > start();
+ process::Future<Option<Position>> start();
// Attempts to append the specified data to the log. Returns the
// new ending position of the log or 'none' if this writer has
// lost it's promise to exclusively write (which can be reacquired
// by invoking Writer::start).
- process::Future<Option<Position> > append(const std::string& data);
+ process::Future<Option<Position>> append(const std::string& data);
// Attempts to truncate the log up to but not including the
// specificed position. Returns the new ending position of the log
// or 'none' if this writer has lost it's promise to exclusively
// write (which can be reacquired by invoking Writer::start).
- process::Future<Option<Position> > truncate(const Position& to);
+ process::Future<Option<Position>> truncate(const Position& to);
private:
internal::log::LogWriterProcess* process;
http://git-wip-us.apache.org/repos/asf/mesos/blob/bea8c3c9/include/mesos/zookeeper/contender.hpp
----------------------------------------------------------------------
diff --git a/include/mesos/zookeeper/contender.hpp b/include/mesos/zookeeper/contender.hpp
index 0ef9d56..21ae840 100644
--- a/include/mesos/zookeeper/contender.hpp
+++ b/include/mesos/zookeeper/contender.hpp
@@ -60,7 +60,7 @@ public:
// the contest (i.e. its membership is lost) and a failure if it is
// unable to watch the membership.
// It should be called only once, otherwise a failure is returned.
- process::Future<process::Future<Nothing> > contend();
+ process::Future<process::Future<Nothing>> contend();
// Returns true if successfully withdrawn from the contest (either
// while contending or has already contended and is watching for
http://git-wip-us.apache.org/repos/asf/mesos/blob/bea8c3c9/include/mesos/zookeeper/detector.hpp
----------------------------------------------------------------------
diff --git a/include/mesos/zookeeper/detector.hpp b/include/mesos/zookeeper/detector.hpp
index a953997..35be0dd 100644
--- a/include/mesos/zookeeper/detector.hpp
+++ b/include/mesos/zookeeper/detector.hpp
@@ -55,7 +55,7 @@ public:
// gets a different result.
//
// TODO(xujyan): Use a Stream abstraction instead.
- process::Future<Option<Group::Membership> > detect(
+ process::Future<Option<Group::Membership>> detect(
const Option<Group::Membership>& previous = None());
private:
http://git-wip-us.apache.org/repos/asf/mesos/blob/bea8c3c9/src/authentication/cram_md5/auxprop.cpp
----------------------------------------------------------------------
diff --git a/src/authentication/cram_md5/auxprop.cpp b/src/authentication/cram_md5/auxprop.cpp
index 8540341..8a20d5b 100644
--- a/src/authentication/cram_md5/auxprop.cpp
+++ b/src/authentication/cram_md5/auxprop.cpp
@@ -180,7 +180,7 @@ int InMemoryAuxiliaryPropertyPlugin::initialize(
VLOG(1) << "Looking up auxiliary property '" << property->name << "'";
- Option<list<string> > values = lookup(user, name);
+ Option<list<string>> values = lookup(user, name);
if (values.isSome()) {
if (values.get().empty()) {
http://git-wip-us.apache.org/repos/asf/mesos/blob/bea8c3c9/src/cli/mesos.cpp
----------------------------------------------------------------------
diff --git a/src/cli/mesos.cpp b/src/cli/mesos.cpp
index 81e2325..ac0b5dd 100644
--- a/src/cli/mesos.cpp
+++ b/src/cli/mesos.cpp
@@ -42,7 +42,7 @@ void usage(const char* argv0)
if (PATH.isSome()) {
foreach (const string& path, strings::split(PATH.get(), ":")) {
- Try<list<string> > matches = fs::list(path::join(path, "mesos-*"));
+ Try<list<string>> matches = fs::list(path::join(path, "mesos-*"));
if (matches.isSome()) {
foreach (const string& match, matches.get()) {
Try<bool> access = os::access(match, X_OK);
http://git-wip-us.apache.org/repos/asf/mesos/blob/bea8c3c9/src/cli/resolve.cpp
----------------------------------------------------------------------
diff --git a/src/cli/resolve.cpp b/src/cli/resolve.cpp
index ac6be05..3a12f12 100644
--- a/src/cli/resolve.cpp
+++ b/src/cli/resolve.cpp
@@ -93,7 +93,7 @@ int main(int argc, char** argv)
return EXIT_FAILURE;
}
- Future<Option<MasterInfo> > masterInfo = detector.get()->detect();
+ Future<Option<MasterInfo>> masterInfo = detector.get()->detect();
if (!masterInfo.await(timeout)) {
cerr << "Failed to detect master from '" << master
http://git-wip-us.apache.org/repos/asf/mesos/blob/bea8c3c9/src/files/files.cpp
----------------------------------------------------------------------
diff --git a/src/files/files.cpp b/src/files/files.cpp
index 793d68e..613f336 100644
--- a/src/files/files.cpp
+++ b/src/files/files.cpp
@@ -430,7 +430,7 @@ Future<Try<list<FileInfo>, FilesError>> FilesProcess::browse(
// The result will be a sorted (on path) list of files and dirs.
map<string, FileInfo> files;
- Try<list<string> > entries = os::ls(resolvedPath.get());
+ Try<list<string>> entries = os::ls(resolvedPath.get());
if (entries.isSome()) {
foreach (const string& entry, entries.get()) {
struct stat s;
http://git-wip-us.apache.org/repos/asf/mesos/blob/bea8c3c9/src/java/jni/org_apache_mesos_Log.cpp
----------------------------------------------------------------------
diff --git a/src/java/jni/org_apache_mesos_Log.cpp b/src/java/jni/org_apache_mesos_Log.cpp
index 04f8afd..eb0f54b 100644
--- a/src/java/jni/org_apache_mesos_Log.cpp
+++ b/src/java/jni/org_apache_mesos_Log.cpp
@@ -151,7 +151,7 @@ JNIEXPORT jobject JNICALL Java_org_apache_mesos_Log_00024Reader_read
jlong jseconds = env->CallLongMethod(junit, toSeconds, jtimeout);
- Future<std::list<Log::Entry> > entries = reader->read(from, to);
+ Future<std::list<Log::Entry>> entries = reader->read(from, to);
if (!entries.await(Seconds(jseconds))) {
// Timed out while trying to read the log.
@@ -306,7 +306,7 @@ JNIEXPORT jobject JNICALL Java_org_apache_mesos_Log_00024Writer_append
jlong jseconds = env->CallLongMethod(junit, toSeconds, jtimeout);
- Future<Option<Log::Position> > position = writer->append(data);
+ Future<Option<Log::Position>> position = writer->append(data);
if (!position.await(Seconds(jseconds))) {
// Timed out while trying to append the log.
@@ -372,7 +372,7 @@ JNIEXPORT jobject JNICALL Java_org_apache_mesos_Log_00024Writer_truncate
jlong jseconds = env->CallLongMethod(junit, toSeconds, jtimeout);
- Future<Option<Log::Position> > position = writer->truncate(to);
+ Future<Option<Log::Position>> position = writer->truncate(to);
if (!position.await(Seconds(jseconds))) {
// Timed out while trying to truncate the log.
@@ -450,7 +450,7 @@ JNIEXPORT void JNICALL Java_org_apache_mesos_Log_00024Writer_initialize
// Try to start the writer.
while (retries-- > 0) {
- Future<Option<Log::Position> > position = writer->start();
+ Future<Option<Log::Position>> position = writer->start();
if (!position.await(seconds)) {
// Cancel the pending start. It is likely that we'll retry right
http://git-wip-us.apache.org/repos/asf/mesos/blob/bea8c3c9/src/java/jni/org_apache_mesos_state_AbstractState.cpp
----------------------------------------------------------------------
diff --git a/src/java/jni/org_apache_mesos_state_AbstractState.cpp b/src/java/jni/org_apache_mesos_state_AbstractState.cpp
index 3101352..8addd2d 100644
--- a/src/java/jni/org_apache_mesos_state_AbstractState.cpp
+++ b/src/java/jni/org_apache_mesos_state_AbstractState.cpp
@@ -401,8 +401,8 @@ JNIEXPORT jlong JNICALL Java_org_apache_mesos_state_AbstractState__1_1store
State* state = (State*) env->GetLongField(thiz, __state);
- Future<Option<Variable> >* future =
- new Future<Option<Variable> >(state->store(*variable));
+ Future<Option<Variable>>* future =
+ new Future<Option<Variable>>(state->store(*variable));
return (jlong) future;
}
@@ -416,7 +416,7 @@ JNIEXPORT jlong JNICALL Java_org_apache_mesos_state_AbstractState__1_1store
JNIEXPORT jboolean JNICALL Java_org_apache_mesos_state_AbstractState__1_1store_1cancel
(JNIEnv* env, jobject thiz, jlong jfuture)
{
- Future<Option<Variable> >* future = (Future<Option<Variable> >*) jfuture;
+ Future<Option<Variable>>* future = (Future<Option<Variable>>*) jfuture;
// We'll initiate a discard but we won't consider it cancelled since
// we don't know if/when the future will get discarded.
@@ -451,7 +451,7 @@ JNIEXPORT jboolean JNICALL Java_org_apache_mesos_state_AbstractState__1_1store_1
JNIEXPORT jboolean JNICALL Java_org_apache_mesos_state_AbstractState__1_1store_1is_1done
(JNIEnv* env, jobject thiz, jlong jfuture)
{
- Future<Option<Variable> >* future = (Future<Option<Variable> >*) jfuture;
+ Future<Option<Variable>>* future = (Future<Option<Variable>>*) jfuture;
return (jboolean) !future->isPending() || future->hasDiscard();
}
@@ -465,7 +465,7 @@ JNIEXPORT jboolean JNICALL Java_org_apache_mesos_state_AbstractState__1_1store_1
JNIEXPORT jobject JNICALL Java_org_apache_mesos_state_AbstractState__1_1store_1get
(JNIEnv* env, jobject thiz, jlong jfuture)
{
- Future<Option<Variable> >* future = (Future<Option<Variable> >*) jfuture;
+ Future<Option<Variable>>* future = (Future<Option<Variable>>*) jfuture;
future->await();
@@ -510,7 +510,7 @@ JNIEXPORT jobject JNICALL Java_org_apache_mesos_state_AbstractState__1_1store_1g
JNIEXPORT jobject JNICALL Java_org_apache_mesos_state_AbstractState__1_1store_1get_1timeout
(JNIEnv* env, jobject thiz, jlong jfuture, jlong jtimeout, jobject junit)
{
- Future<Option<Variable> >* future = (Future<Option<Variable> >*) jfuture;
+ Future<Option<Variable>>* future = (Future<Option<Variable>>*) jfuture;
jclass clazz = env->GetObjectClass(junit);
@@ -569,7 +569,7 @@ JNIEXPORT jobject JNICALL Java_org_apache_mesos_state_AbstractState__1_1store_1g
JNIEXPORT void JNICALL Java_org_apache_mesos_state_AbstractState__1_1store_1finalize
(JNIEnv* env, jobject thiz, jlong jfuture)
{
- Future<Option<Variable> >* future = (Future<Option<Variable> >*) jfuture;
+ Future<Option<Variable>>* future = (Future<Option<Variable>>*) jfuture;
delete future;
}
@@ -1020,8 +1020,8 @@ JNIEXPORT jlong JNICALL Java_org_apache_mesos_state_AbstractState__1_1names
State* state = (State*) env->GetLongField(thiz, __state);
- Future<set<string> >* future =
- new Future<set<string> >(state->names());
+ Future<set<string>>* future =
+ new Future<set<string>>(state->names());
return (jlong) future;
}
@@ -1035,7 +1035,7 @@ JNIEXPORT jlong JNICALL Java_org_apache_mesos_state_AbstractState__1_1names
JNIEXPORT jboolean JNICALL Java_org_apache_mesos_state_AbstractState__1_1names_1cancel
(JNIEnv* env, jobject thiz, jlong jfuture)
{
- Future<set<string> >* future = (Future<set<string> >*) jfuture;
+ Future<set<string>>* future = (Future<set<string>>*) jfuture;
// We'll initiate a discard but we won't consider it cancelled since
// we don't know if/when the future will get discarded.
@@ -1069,7 +1069,7 @@ JNIEXPORT jboolean JNICALL Java_org_apache_mesos_state_AbstractState__1_1names_1
JNIEXPORT jboolean JNICALL Java_org_apache_mesos_state_AbstractState__1_1names_1is_1done
(JNIEnv* env, jobject thiz, jlong jfuture)
{
- Future<set<string> >* future = (Future<set<string> >*) jfuture;
+ Future<set<string>>* future = (Future<set<string>>*) jfuture;
return (jboolean) !future->isPending() || future->hasDiscard();
}
@@ -1083,7 +1083,7 @@ JNIEXPORT jboolean JNICALL Java_org_apache_mesos_state_AbstractState__1_1names_1
JNIEXPORT jobject JNICALL Java_org_apache_mesos_state_AbstractState__1_1names_1get
(JNIEnv* env, jobject thiz, jlong jfuture)
{
- Future<set<string> >* future = (Future<set<string> >*) jfuture;
+ Future<set<string>>* future = (Future<set<string>>*) jfuture;
future->await();
@@ -1131,7 +1131,7 @@ JNIEXPORT jobject JNICALL Java_org_apache_mesos_state_AbstractState__1_1names_1g
JNIEXPORT jobject JNICALL Java_org_apache_mesos_state_AbstractState__1_1names_1get_1timeout
(JNIEnv* env, jobject thiz, jlong jfuture, jlong jtimeout, jobject junit)
{
- Future<set<string> >* future = (Future<set<string> >*) jfuture;
+ Future<set<string>>* future = (Future<set<string>>*) jfuture;
jclass clazz = env->GetObjectClass(junit);
@@ -1193,7 +1193,7 @@ JNIEXPORT jobject JNICALL Java_org_apache_mesos_state_AbstractState__1_1names_1g
JNIEXPORT void JNICALL Java_org_apache_mesos_state_AbstractState__1_1names_1finalize
(JNIEnv* env, jobject thiz, jlong jfuture)
{
- Future<set<string> >* future = (Future<set<string> >*) jfuture;
+ Future<set<string>>* future = (Future<set<string>>*) jfuture;
delete future;
}
http://git-wip-us.apache.org/repos/asf/mesos/blob/bea8c3c9/src/launcher/executor.cpp
----------------------------------------------------------------------
diff --git a/src/launcher/executor.cpp b/src/launcher/executor.cpp
index 9333dc0..52d20af 100644
--- a/src/launcher/executor.cpp
+++ b/src/launcher/executor.cpp
@@ -570,7 +570,7 @@ private:
cout << "Sending SIGTERM to process tree at pid " << pid << endl;
- Try<std::list<os::ProcessTree> > trees =
+ Try<std::list<os::ProcessTree>> trees =
os::killtree(pid, SIGTERM, true, true);
if (trees.isError()) {
@@ -596,7 +596,7 @@ private:
}
}
- void reaped(pid_t pid, const Future<Option<int> >& status_)
+ void reaped(pid_t pid, const Future<Option<int>>& status_)
{
terminated = true;
@@ -662,7 +662,7 @@ private:
// shutdown may leave orphan processes hanging off init. This
// scenario will be handled when PID namespace encapsulated
// execution is in place.
- Try<std::list<os::ProcessTree> > trees =
+ Try<std::list<os::ProcessTree>> trees =
os::killtree(pid, SIGKILL, true, true);
if (trees.isError()) {
http://git-wip-us.apache.org/repos/asf/mesos/blob/bea8c3c9/src/linux/ns.hpp
----------------------------------------------------------------------
diff --git a/src/linux/ns.hpp b/src/linux/ns.hpp
index e905aef..2d6c359 100644
--- a/src/linux/ns.hpp
+++ b/src/linux/ns.hpp
@@ -82,7 +82,7 @@ namespace ns {
inline std::set<std::string> namespaces()
{
std::set<std::string> result;
- Try<std::list<std::string> > entries = os::ls("/proc/self/ns");
+ Try<std::list<std::string>> entries = os::ls("/proc/self/ns");
if (entries.isSome()) {
foreach (const std::string& entry, entries.get()) {
result.insert(entry);
@@ -123,7 +123,7 @@ inline Try<int> nstype(const std::string& ns)
inline Try<Nothing> setns(const std::string& path, const std::string& ns)
{
// Return error if there're multiple threads in the calling process.
- Try<std::set<pid_t> > threads = proc::threads(::getpid());
+ Try<std::set<pid_t>> threads = proc::threads(::getpid());
if (threads.isError()) {
return Error(
"Failed to get the threads of the current process: " +
http://git-wip-us.apache.org/repos/asf/mesos/blob/bea8c3c9/src/log/consensus.cpp
----------------------------------------------------------------------
diff --git a/src/log/consensus.cpp b/src/log/consensus.cpp
index 27f2c58..94ddf24 100644
--- a/src/log/consensus.cpp
+++ b/src/log/consensus.cpp
@@ -130,7 +130,7 @@ private:
.onAny(defer(self(), &Self::broadcasted, lambda::_1));
}
- void broadcasted(const Future<set<Future<PromiseResponse> > >& future)
+ void broadcasted(const Future<set<Future<PromiseResponse>>>& future)
{
if (!future.isReady()) {
promise.fail(
@@ -260,7 +260,7 @@ private:
const uint64_t position;
PromiseRequest request;
- set<Future<PromiseResponse> > responses;
+ set<Future<PromiseResponse>> responses;
size_t responsesReceived;
size_t ignoresReceived;
Option<uint64_t> highestNackProposal;
@@ -333,7 +333,7 @@ private:
.onAny(defer(self(), &Self::broadcasted, lambda::_1));
}
- void broadcasted(const Future<set<Future<PromiseResponse> > >& future)
+ void broadcasted(const Future<set<Future<PromiseResponse>>>& future)
{
if (!future.isReady()) {
promise.fail(
@@ -422,7 +422,7 @@ private:
const uint64_t proposal;
PromiseRequest request;
- set<Future<PromiseResponse> > responses;
+ set<Future<PromiseResponse>> responses;
size_t responsesReceived;
size_t ignoresReceived;
Option<uint64_t> highestNackProposal;
@@ -515,7 +515,7 @@ private:
.onAny(defer(self(), &Self::broadcasted, lambda::_1));
}
- void broadcasted(const Future<set<Future<WriteResponse> > >& future)
+ void broadcasted(const Future<set<Future<WriteResponse>>>& future)
{
if (!future.isReady()) {
promise.fail(
@@ -593,7 +593,7 @@ private:
const Action action;
WriteRequest request;
- set<Future<WriteResponse> > responses;
+ set<Future<WriteResponse>> responses;
size_t responsesReceived;
size_t ignoresReceived;
Option<uint64_t> highestNackProposal;
http://git-wip-us.apache.org/repos/asf/mesos/blob/bea8c3c9/src/log/coordinator.cpp
----------------------------------------------------------------------
diff --git a/src/log/coordinator.cpp b/src/log/coordinator.cpp
index ecf457f..72ef036 100644
--- a/src/log/coordinator.cpp
+++ b/src/log/coordinator.cpp
@@ -59,10 +59,10 @@ public:
virtual ~CoordinatorProcess() {}
// See comments in 'coordinator.hpp'.
- Future<Option<uint64_t> > elect();
+ Future<Option<uint64_t>> elect();
Future<uint64_t> demote();
- Future<Option<uint64_t> > append(const string& bytes);
- Future<Option<uint64_t> > truncate(uint64_t to);
+ Future<Option<uint64_t>> append(const string& bytes);
+ Future<Option<uint64_t>> truncate(uint64_t to);
protected:
virtual void finalize()
@@ -79,11 +79,11 @@ private:
Future<uint64_t> getLastProposal();
Future<Nothing> updateProposal(uint64_t promised);
Future<PromiseResponse> runPromisePhase();
- Future<Option<uint64_t> > checkPromisePhase(const PromiseResponse& response);
- Future<IntervalSet<uint64_t> > getMissingPositions();
+ Future<Option<uint64_t>> checkPromisePhase(const PromiseResponse& response);
+ Future<IntervalSet<uint64_t>> getMissingPositions();
Future<Nothing> catchupMissingPositions(
const IntervalSet<uint64_t>& positions);
- Future<Option<uint64_t> > updateIndexAfterElected();
+ Future<Option<uint64_t>> updateIndexAfterElected();
void electingFinished(const Option<uint64_t>& position);
void electingFailed();
void electingAborted();
@@ -92,14 +92,14 @@ private:
// Writing related functions. //
/////////////////////////////////
- Future<Option<uint64_t> > write(const Action& action);
+ Future<Option<uint64_t>> write(const Action& action);
Future<WriteResponse> runWritePhase(const Action& action);
- Future<Option<uint64_t> > checkWritePhase(
+ Future<Option<uint64_t>> checkWritePhase(
const Action& action,
const WriteResponse& response);
Future<Nothing> runLearnPhase(const Action& action);
Future<bool> checkLearnPhase(const Action& action);
- Future<Option<uint64_t> > updateIndexAfterWritten(bool missing);
+ Future<Option<uint64_t>> updateIndexAfterWritten(bool missing);
void writingFinished();
void writingFailed();
void writingAborted();
@@ -130,8 +130,8 @@ private:
// The position to which the next entry will be written.
uint64_t index;
- Future<Option<uint64_t> > electing;
- Future<Option<uint64_t> > writing;
+ Future<Option<uint64_t>> electing;
+ Future<Option<uint64_t>> writing;
};
@@ -140,7 +140,7 @@ private:
/////////////////////////////////////////////////
-Future<Option<uint64_t> > CoordinatorProcess::elect()
+Future<Option<uint64_t>> CoordinatorProcess::elect()
{
if (state == ELECTING) {
return electing;
@@ -189,7 +189,7 @@ Future<PromiseResponse> CoordinatorProcess::runPromisePhase()
}
-Future<Option<uint64_t> > CoordinatorProcess::checkPromisePhase(
+Future<Option<uint64_t>> CoordinatorProcess::checkPromisePhase(
const PromiseResponse& response)
{
CHECK(response.has_type());
@@ -226,7 +226,7 @@ Future<Option<uint64_t> > CoordinatorProcess::checkPromisePhase(
}
-Future<IntervalSet<uint64_t> > CoordinatorProcess::getMissingPositions()
+Future<IntervalSet<uint64_t>> CoordinatorProcess::getMissingPositions()
{
return replica->missing(0, index);
}
@@ -249,7 +249,7 @@ Future<Nothing> CoordinatorProcess::catchupMissingPositions(
}
-Future<Option<uint64_t> > CoordinatorProcess::updateIndexAfterElected()
+Future<Option<uint64_t>> CoordinatorProcess::updateIndexAfterElected()
{
return Option<uint64_t>(index++);
}
@@ -303,7 +303,7 @@ Future<uint64_t> CoordinatorProcess::demote()
/////////////////////////////////////////////////
-Future<Option<uint64_t> > CoordinatorProcess::append(const string& bytes)
+Future<Option<uint64_t>> CoordinatorProcess::append(const string& bytes)
{
if (state == INITIAL || state == ELECTING) {
return None();
@@ -323,7 +323,7 @@ Future<Option<uint64_t> > CoordinatorProcess::append(const string& bytes)
}
-Future<Option<uint64_t> > CoordinatorProcess::truncate(uint64_t to)
+Future<Option<uint64_t>> CoordinatorProcess::truncate(uint64_t to)
{
if (state == INITIAL || state == ELECTING) {
return None();
@@ -343,7 +343,7 @@ Future<Option<uint64_t> > CoordinatorProcess::truncate(uint64_t to)
}
-Future<Option<uint64_t> > CoordinatorProcess::write(const Action& action)
+Future<Option<uint64_t>> CoordinatorProcess::write(const Action& action)
{
LOG(INFO) << "Coordinator attempting to write " << action.type()
<< " action at position " << action.position();
@@ -369,7 +369,7 @@ Future<WriteResponse> CoordinatorProcess::runWritePhase(const Action& action)
}
-Future<Option<uint64_t> > CoordinatorProcess::checkWritePhase(
+Future<Option<uint64_t>> CoordinatorProcess::checkWritePhase(
const Action& action,
const WriteResponse& response)
{
@@ -402,7 +402,7 @@ Future<bool> CoordinatorProcess::checkLearnPhase(const Action& action)
}
-Future<Option<uint64_t> > CoordinatorProcess::updateIndexAfterWritten(
+Future<Option<uint64_t>> CoordinatorProcess::updateIndexAfterWritten(
bool missing)
{
CHECK(!missing) << "Not expecting local replica to be missing position "
@@ -461,7 +461,7 @@ Coordinator::~Coordinator()
}
-Future<Option<uint64_t> > Coordinator::elect()
+Future<Option<uint64_t>> Coordinator::elect()
{
return dispatch(process, &CoordinatorProcess::elect);
}
@@ -473,13 +473,13 @@ Future<uint64_t> Coordinator::demote()
}
-Future<Option<uint64_t> > Coordinator::append(const string& bytes)
+Future<Option<uint64_t>> Coordinator::append(const string& bytes)
{
return dispatch(process, &CoordinatorProcess::append, bytes);
}
-Future<Option<uint64_t> > Coordinator::truncate(uint64_t to)
+Future<Option<uint64_t>> Coordinator::truncate(uint64_t to)
{
return dispatch(process, &CoordinatorProcess::truncate, to);
}
http://git-wip-us.apache.org/repos/asf/mesos/blob/bea8c3c9/src/log/coordinator.hpp
----------------------------------------------------------------------
diff --git a/src/log/coordinator.hpp b/src/log/coordinator.hpp
index 9fa4f19..b5f9c96 100644
--- a/src/log/coordinator.hpp
+++ b/src/log/coordinator.hpp
@@ -50,7 +50,7 @@ public:
// Handles coordinator election. Returns the last committed (a.k.a.,
// learned) log position if the operation succeeds. Returns none if
// the election is not successful, but can be retried.
- process::Future<Option<uint64_t> > elect();
+ process::Future<Option<uint64_t>> elect();
// Handles coordinator demotion. Returns the last committed (a.k.a.,
// learned) log position if the operation succeeds. One should only
@@ -61,13 +61,13 @@ public:
// Appends the specified bytes to the end of the log. Returns the
// position of the appended entry if the operation succeeds or none
// if the coordinator was demoted.
- process::Future<Option<uint64_t> > append(const std::string& bytes);
+ process::Future<Option<uint64_t>> append(const std::string& bytes);
// Removes all log entries preceding the log entry at the given
// position (to). Returns the position at which the truncate
// operation is written if the operation succeeds or none if the
// coordinator was demoted.
- process::Future<Option<uint64_t> > truncate(uint64_t to);
+ process::Future<Option<uint64_t>> truncate(uint64_t to);
private:
CoordinatorProcess* process;
http://git-wip-us.apache.org/repos/asf/mesos/blob/bea8c3c9/src/log/log.cpp
----------------------------------------------------------------------
diff --git a/src/log/log.cpp b/src/log/log.cpp
index 0940f92..be511d9 100644
--- a/src/log/log.cpp
+++ b/src/log/log.cpp
@@ -128,13 +128,13 @@ void LogProcess::finalize()
{
if (recovering.isSome()) {
// Stop the recovery if it is still pending.
- Future<Owned<Replica> > future = recovering.get();
+ Future<Owned<Replica>> future = recovering.get();
future.discard();
}
// If there exist operations that are gated by the recovery, we fail
// all of them because the log is being deleted.
- foreach (process::Promise<Shared<Replica> >* promise, promises) {
+ foreach (process::Promise<Shared<Replica>>* promise, promises) {
promise->fail("Log is being deleted");
delete promise;
}
@@ -153,7 +153,7 @@ void LogProcess::finalize()
}
-Future<Shared<Replica> > LogProcess::recover()
+Future<Shared<Replica>> LogProcess::recover()
{
// The future 'recovered' is used to mark the success (or the
// failure) of the recovery. We do not use the future 'recovering'
@@ -174,8 +174,8 @@ Future<Shared<Replica> > LogProcess::recover()
// Recovery has not finished yet. Create a promise and queue it such
// that it can get notified once the recovery has finished (either
// succeeded or failed).
- process::Promise<Shared<Replica> >* promise =
- new process::Promise<Shared<Replica> >();
+ process::Promise<Shared<Replica>>* promise =
+ new process::Promise<Shared<Replica>>();
promises.push_back(promise);
@@ -205,7 +205,7 @@ void LogProcess::_recover()
{
CHECK_SOME(recovering);
- Future<Owned<Replica> > future = recovering.get();
+ Future<Owned<Replica>> future = recovering.get();
if (!future.isReady()) {
VLOG(2) << "Log recovery failed";
@@ -218,7 +218,7 @@ void LogProcess::_recover()
// Mark the failure of the recovery.
recovered.fail(failure);
- foreach (process::Promise<Shared<Replica> >* promise, promises) {
+ foreach (process::Promise<Shared<Replica>>* promise, promises) {
promise->fail(failure);
delete promise;
}
@@ -233,7 +233,7 @@ void LogProcess::_recover()
// Mark the success of the recovery.
recovered.set(Nothing());
- foreach (process::Promise<Shared<Replica> >* promise, promises) {
+ foreach (process::Promise<Shared<Replica>>* promise, promises) {
promise->set(replica);
delete promise;
}
@@ -399,7 +399,7 @@ Future<Log::Position> LogReaderProcess::_ending()
}
-Future<list<Log::Entry> > LogReaderProcess::read(
+Future<list<Log::Entry>> LogReaderProcess::read(
const Log::Position& from,
const Log::Position& to)
{
@@ -407,7 +407,7 @@ Future<list<Log::Entry> > LogReaderProcess::read(
}
-Future<list<Log::Entry> > LogReaderProcess::_read(
+Future<list<Log::Entry>> LogReaderProcess::_read(
const Log::Position& from,
const Log::Position& to)
{
@@ -418,7 +418,7 @@ Future<list<Log::Entry> > LogReaderProcess::_read(
}
-Future<list<Log::Entry> > LogReaderProcess::__read(
+Future<list<Log::Entry>> LogReaderProcess::__read(
const Log::Position& from,
const Log::Position& to,
const list<Action>& actions)
@@ -532,13 +532,13 @@ void LogWriterProcess::_recover()
}
-Future<Option<Log::Position> > LogWriterProcess::start()
+Future<Option<Log::Position>> LogWriterProcess::start()
{
return recover().then(defer(self(), &Self::_start));
}
-Future<Option<Log::Position> > LogWriterProcess::_start()
+Future<Option<Log::Position>> LogWriterProcess::_start()
{
// We delete the existing coordinator (if exists) and create a new
// coordinator each time 'start' is called.
@@ -572,7 +572,7 @@ Option<Log::Position> LogWriterProcess::__start(
}
-Future<Option<Log::Position> > LogWriterProcess::append(const string& bytes)
+Future<Option<Log::Position>> LogWriterProcess::append(const string& bytes)
{
VLOG(1) << "Attempting to append " << bytes.size() << " bytes to the log";
@@ -590,7 +590,7 @@ Future<Option<Log::Position> > LogWriterProcess::append(const string& bytes)
}
-Future<Option<Log::Position> > LogWriterProcess::truncate(
+Future<Option<Log::Position>> LogWriterProcess::truncate(
const Log::Position& to)
{
VLOG(1) << "Attempting to truncate the log to " << to.value;
@@ -711,7 +711,7 @@ Log::Reader::~Reader()
}
-Future<list<Log::Entry> > Log::Reader::read(
+Future<list<Log::Entry>> Log::Reader::read(
const Log::Position& from,
const Log::Position& to)
{
@@ -751,19 +751,19 @@ Log::Writer::~Writer()
}
-Future<Option<Log::Position> > Log::Writer::start()
+Future<Option<Log::Position>> Log::Writer::start()
{
return dispatch(process, &LogWriterProcess::start);
}
-Future<Option<Log::Position> > Log::Writer::append(const string& data)
+Future<Option<Log::Position>> Log::Writer::append(const string& data)
{
return dispatch(process, &LogWriterProcess::append, data);
}
-Future<Option<Log::Position> > Log::Writer::truncate(const Log::Position& to)
+Future<Option<Log::Position>> Log::Writer::truncate(const Log::Position& to)
{
return dispatch(process, &LogWriterProcess::truncate, to);
}
http://git-wip-us.apache.org/repos/asf/mesos/blob/bea8c3c9/src/log/main.cpp
----------------------------------------------------------------------
diff --git a/src/log/main.cpp b/src/log/main.cpp
index 171c312..deccd29 100644
--- a/src/log/main.cpp
+++ b/src/log/main.cpp
@@ -41,7 +41,7 @@ using std::endl;
using std::string;
// All the registered tools.
-static hashmap<string, Owned<tool::Tool> > tools;
+static hashmap<string, Owned<tool::Tool>> tools;
static void add(const Owned<tool::Tool>& tool)
http://git-wip-us.apache.org/repos/asf/mesos/blob/bea8c3c9/src/log/network.hpp
----------------------------------------------------------------------
diff --git a/src/log/network.hpp b/src/log/network.hpp
index 8750880..0afcfae 100644
--- a/src/log/network.hpp
+++ b/src/log/network.hpp
@@ -84,7 +84,7 @@ public:
// Sends a request to each member of the network and returns a set
// of futures that represent their responses.
template <typename Req, typename Res>
- process::Future<std::set<process::Future<Res> > > broadcast(
+ process::Future<std::set<process::Future<Res>>> broadcast(
const Protocol<Req, Res>& protocol,
const Req& req,
const std::set<process::UPID>& filter = std::set<process::UPID>()) const;
@@ -126,14 +126,14 @@ private:
void watch(const std::set<zookeeper::Group::Membership>& expected);
// Invoked when the group memberships have changed.
- void watched(const process::Future<std::set<zookeeper::Group::Membership> >&);
+ void watched(const process::Future<std::set<zookeeper::Group::Membership>>&);
// Invoked when group members data has been collected.
void collected(
- const process::Future<std::list<Option<std::string> > >& datas);
+ const process::Future<std::list<Option<std::string>>>& datas);
zookeeper::Group group;
- process::Future<std::set<zookeeper::Group::Membership> > memberships;
+ process::Future<std::set<zookeeper::Group::Membership>> memberships;
// The set of PIDs that are always in the network.
std::set<process::UPID> base;
@@ -219,12 +219,12 @@ public:
// Sends a request to each of the groups members and returns a set
// of futures that represent their responses.
template <typename Req, typename Res>
- std::set<process::Future<Res> > broadcast(
+ std::set<process::Future<Res>> broadcast(
const Protocol<Req, Res>& protocol,
const Req& req,
const std::set<process::UPID>& filter)
{
- std::set<process::Future<Res> > futures;
+ std::set<process::Future<Res>> futures;
typename std::set<process::UPID>::const_iterator iterator;
for (iterator = pids.begin(); iterator != pids.end(); ++iterator) {
const process::UPID& pid = *iterator;
@@ -368,7 +368,7 @@ inline process::Future<size_t> Network::watch(
template <typename Req, typename Res>
-process::Future<std::set<process::Future<Res> > > Network::broadcast(
+process::Future<std::set<process::Future<Res>>> Network::broadcast(
const Protocol<Req, Res>& protocol,
const Req& req,
const std::set<process::UPID>& filter) const
@@ -417,7 +417,7 @@ inline void ZooKeeperNetwork::watch(
inline void ZooKeeperNetwork::watched(
- const process::Future<std::set<zookeeper::Group::Membership> >&)
+ const process::Future<std::set<zookeeper::Group::Membership>>&)
{
if (memberships.isFailed()) {
// We can't do much here, we could try creating another Group but
@@ -432,7 +432,7 @@ inline void ZooKeeperNetwork::watched(
LOG(INFO) << "ZooKeeper group memberships changed";
// Get data for each membership in order to convert them to PIDs.
- std::list<process::Future<Option<std::string> > > futures;
+ std::list<process::Future<Option<std::string>>> futures;
foreach (const zookeeper::Group::Membership& membership, memberships.get()) {
futures.push_back(group.data(membership));
@@ -451,7 +451,7 @@ inline void ZooKeeperNetwork::watched(
inline void ZooKeeperNetwork::collected(
- const process::Future<std::list<Option<std::string> > >& datas)
+ const process::Future<std::list<Option<std::string>>>& datas)
{
if (datas.isFailed()) {
LOG(WARNING) << "Failed to get data for ZooKeeper group members: "
http://git-wip-us.apache.org/repos/asf/mesos/blob/bea8c3c9/src/log/recover.cpp
----------------------------------------------------------------------
diff --git a/src/log/recover.cpp b/src/log/recover.cpp
index eaf3fd3..b366818 100644
--- a/src/log/recover.cpp
+++ b/src/log/recover.cpp
@@ -103,8 +103,8 @@ protected:
}
private:
- static Future<Option<RecoverResponse> > timedout(
- Future<Option<RecoverResponse> > future,
+ static Future<Option<RecoverResponse>> timedout(
+ Future<Option<RecoverResponse>> future,
const Duration& timeout)
{
LOG(INFO) << "Unable to finish the recover protocol in "
@@ -151,7 +151,7 @@ private:
.then(defer(self(), &Self::broadcasted, lambda::_1));
}
- Future<Nothing> broadcasted(const set<Future<RecoverResponse> >& _responses)
+ Future<Nothing> broadcasted(const set<Future<RecoverResponse>>& _responses)
{
VLOG(2) << "Broadcast request completed";
@@ -166,7 +166,7 @@ private:
}
// Returns None if we need to re-run the protocol.
- Future<Option<RecoverResponse> > receive()
+ Future<Option<RecoverResponse>> receive()
{
if (responses.empty()) {
// All responses have been received but we haven't received
@@ -182,7 +182,7 @@ private:
.then(defer(self(), &Self::received, lambda::_1));
}
- Future<Option<RecoverResponse> > received(
+ Future<Option<RecoverResponse>> received(
const Future<RecoverResponse>& future)
{
// Enforced by the select semantics.
@@ -311,7 +311,7 @@ private:
return receive();
}
- void finished(const Future<Option<RecoverResponse> >& future)
+ void finished(const Future<Option<RecoverResponse>>& future)
{
if (future.isDiscarded()) {
// We use the boolean flag 'terminating' to distinguish between
@@ -353,11 +353,11 @@ private:
const bool autoInitialize;
const Duration timeout;
- set<Future<RecoverResponse> > responses;
+ set<Future<RecoverResponse>> responses;
hashmap<Metadata::Status, size_t> responsesReceived;
Option<uint64_t> lowestBeginPosition;
Option<uint64_t> highestEndPosition;
- Future<Option<RecoverResponse> > chain;
+ Future<Option<RecoverResponse>> chain;
bool terminating;
process::Promise<RecoverResponse> promise;
@@ -443,7 +443,7 @@ public:
network(_network),
autoInitialize(_autoInitialize) {}
- Future<Owned<Replica> > future() { return promise.future(); }
+ Future<Owned<Replica>> future() { return promise.future(); }
protected:
virtual void initialize()
@@ -620,11 +620,11 @@ private:
Future<Nothing> chain;
- process::Promise<Owned<Replica> > promise;
+ process::Promise<Owned<Replica>> promise;
};
-Future<Owned<Replica> > recover(
+Future<Owned<Replica>> recover(
size_t quorum,
const Owned<Replica>& replica,
const Shared<Network>& network,
@@ -637,7 +637,7 @@ Future<Owned<Replica> > recover(
network,
autoInitialize);
- Future<Owned<Replica> > future = process->future();
+ Future<Owned<Replica>> future = process->future();
spawn(process, true);
return future;
}
http://git-wip-us.apache.org/repos/asf/mesos/blob/bea8c3c9/src/log/recover.hpp
----------------------------------------------------------------------
diff --git a/src/log/recover.hpp b/src/log/recover.hpp
index 97793b6..94d6bb2 100644
--- a/src/log/recover.hpp
+++ b/src/log/recover.hpp
@@ -49,7 +49,7 @@ namespace log {
// an empty replica will be allowed to vote if ALL replicas (i.e.,
// quorum * 2 - 1) are empty. This allows us to bootstrap the
// replicated log without explicitly using an initialization tool.
-extern process::Future<process::Owned<Replica> > recover(
+extern process::Future<process::Owned<Replica>> recover(
size_t quorum,
const process::Owned<Replica>& replica,
const process::Shared<Network>& network,
http://git-wip-us.apache.org/repos/asf/mesos/blob/bea8c3c9/src/log/tool/benchmark.cpp
----------------------------------------------------------------------
diff --git a/src/log/tool/benchmark.cpp b/src/log/tool/benchmark.cpp
index da35b08..8264fda 100644
--- a/src/log/tool/benchmark.cpp
+++ b/src/log/tool/benchmark.cpp
@@ -177,7 +177,7 @@ Try<Nothing> Benchmark::execute(int argc, char** argv)
// Create the log writer.
Log::Writer writer(&log);
- Future<Option<Log::Position> > position = writer.start();
+ Future<Option<Log::Position>> position = writer.start();
if (!position.await(Seconds(15))) {
return Error("Failed to start a log writer: timed out");
http://git-wip-us.apache.org/repos/asf/mesos/blob/bea8c3c9/src/master/registrar.cpp
----------------------------------------------------------------------
diff --git a/src/master/registrar.cpp b/src/master/registrar.cpp
index 4d1eaa0..7aa0148 100644
--- a/src/master/registrar.cpp
+++ b/src/master/registrar.cpp
@@ -197,15 +197,15 @@ private:
// Continuations.
void _recover(
const MasterInfo& info,
- const Future<Variable<Registry> >& recovery);
+ const Future<Variable<Registry>>& recovery);
void __recover(const Future<bool>& recover);
Future<bool> _apply(Owned<Operation> operation);
// Helper for updating state (performing store).
void update();
void _update(
- const Future<Option<Variable<Registry> > >& store,
- deque<Owned<Operation> > operations);
+ const Future<Option<Variable<Registry>>>& store,
+ deque<Owned<Operation>> operations);
// Fails all pending operations and transitions the Registrar
// into an error state in which all subsequent operations will fail.
@@ -213,15 +213,15 @@ private:
// performing more State storage operations.
void abort(const string& message);
- Option<Variable<Registry> > variable;
- deque<Owned<Operation> > operations;
+ Option<Variable<Registry>> variable;
+ deque<Owned<Operation>> operations;
bool updating; // Used to signify fetching (recovering) or storing.
const Flags flags;
State* state;
// Used to compose our operations with recovery.
- Option<Owned<Promise<Registry> > > recovered;
+ Option<Owned<Promise<Registry>>> recovered;
// When an error is encountered from abort(), we'll fail all
// subsequent operations.
@@ -335,13 +335,13 @@ Future<Registry> RegistrarProcess::recover(const MasterInfo& info)
state->fetch<Registry>("registry")
.after(flags.registry_fetch_timeout,
lambda::bind(
- &timeout<Variable<Registry> >,
+ &timeout<Variable<Registry>>,
"fetch",
flags.registry_fetch_timeout,
lambda::_1))
.onAny(defer(self(), &Self::_recover, info, lambda::_1));
updating = true;
- recovered = Owned<Promise<Registry> >(new Promise<Registry>());
+ recovered = Owned<Promise<Registry>>(new Promise<Registry>());
}
return recovered.get()->future();
@@ -350,7 +350,7 @@ Future<Registry> RegistrarProcess::recover(const MasterInfo& info)
void RegistrarProcess::_recover(
const MasterInfo& info,
- const Future<Variable<Registry> >& recovery)
+ const Future<Variable<Registry>>& recovery)
{
updating = false;
@@ -469,7 +469,7 @@ void RegistrarProcess::update()
state->store(variable.get().mutate(registry))
.after(flags.registry_store_timeout,
lambda::bind(
- &timeout<Option<Variable<Registry> > >,
+ &timeout<Option<Variable<Registry>>>,
"store",
flags.registry_store_timeout,
lambda::_1))
@@ -481,8 +481,8 @@ void RegistrarProcess::update()
void RegistrarProcess::_update(
- const Future<Option<Variable<Registry> > >& store,
- deque<Owned<Operation> > applied)
+ const Future<Option<Variable<Registry>>>& store,
+ deque<Owned<Operation>> applied)
{
updating = false;
http://git-wip-us.apache.org/repos/asf/mesos/blob/bea8c3c9/src/slave/gc.cpp
----------------------------------------------------------------------
diff --git a/src/slave/gc.cpp b/src/slave/gc.cpp
index a0af68b..961f547 100644
--- a/src/slave/gc.cpp
+++ b/src/slave/gc.cpp
@@ -60,7 +60,7 @@ Future<Nothing> GarbageCollectorProcess::schedule(
CHECK(unschedule(path));
}
- Owned<Promise<Nothing> > promise(new Promise<Nothing>());
+ Owned<Promise<Nothing>> promise(new Promise<Nothing>());
Timeout removalTime = Timeout::in(d);
http://git-wip-us.apache.org/repos/asf/mesos/blob/bea8c3c9/src/slave/gc.hpp
----------------------------------------------------------------------
diff --git a/src/slave/gc.hpp b/src/slave/gc.hpp
index 9a09e7b..5ea8245 100644
--- a/src/slave/gc.hpp
+++ b/src/slave/gc.hpp
@@ -108,7 +108,7 @@ private:
struct PathInfo
{
PathInfo(const std::string& _path,
- process::Owned<process::Promise<Nothing> > _promise)
+ process::Owned<process::Promise<Nothing>> _promise)
: path(_path), promise(_promise) {}
bool operator==(const PathInfo& that) const
@@ -117,7 +117,7 @@ private:
}
const std::string path;
- const process::Owned<process::Promise<Nothing> > promise;
+ const process::Owned<process::Promise<Nothing>> promise;
};
// Store all the timeouts and corresponding paths to delete.
http://git-wip-us.apache.org/repos/asf/mesos/blob/bea8c3c9/src/slave/state.cpp
----------------------------------------------------------------------
diff --git a/src/slave/state.cpp b/src/slave/state.cpp
index 91dee11..a94bb8d 100644
--- a/src/slave/state.cpp
+++ b/src/slave/state.cpp
@@ -165,7 +165,7 @@ Try<SlaveState> SlaveState::recover(
state.info = slaveInfo.get();
// Find the frameworks.
- Try<list<string> > frameworks = paths::getFrameworkPaths(rootDir, slaveId);
+ Try<list<string>> frameworks = paths::getFrameworkPaths(rootDir, slaveId);
if (frameworks.isError()) {
return Error("Failed to find frameworks for agent " + slaveId.value() +
@@ -272,7 +272,7 @@ Try<FrameworkState> FrameworkState::recover(
state.pid = process::UPID(pid.get());
// Find the executors.
- Try<list<string> > executors =
+ Try<list<string>> executors =
paths::getExecutorPaths(rootDir, slaveId, frameworkId);
if (executors.isError()) {
@@ -314,7 +314,7 @@ Try<ExecutorState> ExecutorState::recover(
string message;
// Find the runs.
- Try<list<string> > runs = paths::getExecutorRunPaths(
+ Try<list<string>> runs = paths::getExecutorRunPaths(
rootDir,
slaveId,
frameworkId,
@@ -431,7 +431,7 @@ Try<RunState> RunState::recover(
state.completed = os::exists(path);
// Find the tasks.
- Try<list<string> > tasks = paths::getTaskPaths(
+ Try<list<string>> tasks = paths::getTaskPaths(
rootDir,
slaveId,
frameworkId,
http://git-wip-us.apache.org/repos/asf/mesos/blob/bea8c3c9/src/slave/status_update_manager.cpp
----------------------------------------------------------------------
diff --git a/src/slave/status_update_manager.cpp b/src/slave/status_update_manager.cpp
index 9c67b85..056a684 100644
--- a/src/slave/status_update_manager.cpp
+++ b/src/slave/status_update_manager.cpp
@@ -144,7 +144,7 @@ private:
function<void(StatusUpdate)> forward_;
- hashmap<FrameworkID, hashmap<TaskID, StatusUpdateStream*> > streams;
+ hashmap<FrameworkID, hashmap<TaskID, StatusUpdateStream*>> streams;
};
http://git-wip-us.apache.org/repos/asf/mesos/blob/bea8c3c9/src/tests/allocator.hpp
----------------------------------------------------------------------
diff --git a/src/tests/allocator.hpp b/src/tests/allocator.hpp
index c4d835a..5ca3057 100644
--- a/src/tests/allocator.hpp
+++ b/src/tests/allocator.hpp
@@ -411,7 +411,7 @@ public:
const SlaveID&));
MOCK_METHOD1(updateWhitelist, void(
- const Option<hashset<std::string> >&));
+ const Option<hashset<std::string>>&));
MOCK_METHOD2(requestResources, void(
const FrameworkID&,
http://git-wip-us.apache.org/repos/asf/mesos/blob/bea8c3c9/src/tests/containerizer.cpp
----------------------------------------------------------------------
diff --git a/src/tests/containerizer.cpp b/src/tests/containerizer.cpp
index 105ca9c..6f3950d 100644
--- a/src/tests/containerizer.cpp
+++ b/src/tests/containerizer.cpp
@@ -272,7 +272,7 @@ void TestContainerizer::_destroy(const ContainerID& containerId)
}
-Future<hashset<ContainerID> > TestContainerizer::containers()
+Future<hashset<ContainerID>> TestContainerizer::containers()
{
return promises.keys();
}
http://git-wip-us.apache.org/repos/asf/mesos/blob/bea8c3c9/src/tests/containerizer.hpp
----------------------------------------------------------------------
diff --git a/src/tests/containerizer.hpp b/src/tests/containerizer.hpp
index ded331b..76feedf 100644
--- a/src/tests/containerizer.hpp
+++ b/src/tests/containerizer.hpp
@@ -144,10 +144,10 @@ private:
hashmap<ExecutorID, std::shared_ptr<MockV1HTTPExecutor>> v1Executors;
hashmap<std::pair<FrameworkID, ExecutorID>, ContainerID> containers_;
- hashmap<ContainerID, process::Owned<MesosExecutorDriver> > drivers;
- hashmap<ContainerID, process::Owned<executor::TestV1Mesos> > v1Libraries;
+ hashmap<ContainerID, process::Owned<MesosExecutorDriver>> drivers;
+ hashmap<ContainerID, process::Owned<executor::TestV1Mesos>> v1Libraries;
hashmap<ContainerID,
- process::Owned<process::Promise<containerizer::Termination> > > promises;
+ process::Owned<process::Promise<containerizer::Termination>>> promises;
};
} // namespace tests {
http://git-wip-us.apache.org/repos/asf/mesos/blob/bea8c3c9/src/tests/containerizer/composing_containerizer_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/containerizer/composing_containerizer_tests.cpp b/src/tests/containerizer/composing_containerizer_tests.cpp
index e7e3b62..e7619c1 100644
--- a/src/tests/containerizer/composing_containerizer_tests.cpp
+++ b/src/tests/containerizer/composing_containerizer_tests.cpp
@@ -101,7 +101,7 @@ public:
MOCK_METHOD0(
containers,
- process::Future<hashset<ContainerID> >());
+ process::Future<hashset<ContainerID>>());
};
http://git-wip-us.apache.org/repos/asf/mesos/blob/bea8c3c9/src/tests/containerizer/docker_containerizer_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/containerizer/docker_containerizer_tests.cpp b/src/tests/containerizer/docker_containerizer_tests.cpp
index 4e5b1fd..66adeec 100644
--- a/src/tests/containerizer/docker_containerizer_tests.cpp
+++ b/src/tests/containerizer/docker_containerizer_tests.cpp
@@ -207,7 +207,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_Launch_Executor)
EXPECT_CALL(sched, registered(&driver, _, _))
.WillOnce(FutureArg<1>(&frameworkId));
- Future<vector<Offer> > offers;
+ Future<vector<Offer>> offers;
EXPECT_CALL(sched, resourceOffers(&driver, _))
.WillOnce(FutureArg<1>(&offers))
.WillRepeatedly(Return()); // Ignore subsequent offers.
@@ -334,7 +334,7 @@ TEST_F(DockerContainerizerTest, DISABLED_ROOT_DOCKER_Launch_Executor_Bridged)
EXPECT_CALL(sched, registered(&driver, _, _))
.WillOnce(FutureArg<1>(&frameworkId));
- Future<vector<Offer> > offers;
+ Future<vector<Offer>> offers;
EXPECT_CALL(sched, resourceOffers(&driver, _))
.WillOnce(FutureArg<1>(&offers))
.WillRepeatedly(Return()); // Ignore subsequent offers.
@@ -453,7 +453,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_Launch)
EXPECT_CALL(sched, registered(&driver, _, _))
.WillOnce(FutureArg<1>(&frameworkId));
- Future<vector<Offer> > offers;
+ Future<vector<Offer>> offers;
EXPECT_CALL(sched, resourceOffers(&driver, _))
.WillOnce(FutureArg<1>(&offers))
.WillRepeatedly(Return()); // Ignore subsequent offers.
@@ -603,7 +603,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_Kill)
EXPECT_CALL(sched, registered(&driver, _, _))
.WillOnce(FutureArg<1>(&frameworkId));
- Future<vector<Offer> > offers;
+ Future<vector<Offer>> offers;
EXPECT_CALL(sched, resourceOffers(&driver, _))
.WillOnce(FutureArg<1>(&offers))
.WillRepeatedly(Return()); // Ignore subsequent offers.
@@ -728,7 +728,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_TaskKillingCapability)
EXPECT_CALL(sched, registered(&driver, _, _))
.WillOnce(FutureArg<1>(&frameworkId));
- Future<vector<Offer> > offers;
+ Future<vector<Offer>> offers;
EXPECT_CALL(sched, resourceOffers(&driver, _))
.WillOnce(FutureArg<1>(&offers))
.WillRepeatedly(Return()); // Ignore subsequent offers.
@@ -850,7 +850,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_Usage)
EXPECT_CALL(sched, registered(&driver, _, _))
.WillOnce(FutureArg<1>(&frameworkId));
- Future<vector<Offer> > offers;
+ Future<vector<Offer>> offers;
EXPECT_CALL(sched, resourceOffers(&driver, _))
.WillOnce(FutureArg<1>(&offers))
.WillRepeatedly(Return()); // Ignore subsequent offers.
@@ -995,7 +995,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_Update)
EXPECT_CALL(sched, registered(&driver, _, _))
.WillOnce(FutureArg<1>(&frameworkId));
- Future<vector<Offer> > offers;
+ Future<vector<Offer>> offers;
EXPECT_CALL(sched, resourceOffers(&driver, _))
.WillOnce(FutureArg<1>(&offers))
.WillRepeatedly(Return()); // Ignore subsequent offers.
@@ -1970,7 +1970,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_Logs)
EXPECT_CALL(sched, registered(&driver, _, _))
.WillOnce(FutureArg<1>(&frameworkId));
- Future<vector<Offer> > offers;
+ Future<vector<Offer>> offers;
EXPECT_CALL(sched, resourceOffers(&driver, _))
.WillOnce(FutureArg<1>(&offers))
.WillRepeatedly(Return()); // Ignore subsequent offers.
@@ -2108,7 +2108,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_Default_CMD)
EXPECT_CALL(sched, registered(&driver, _, _))
.WillOnce(FutureArg<1>(&frameworkId));
- Future<vector<Offer> > offers;
+ Future<vector<Offer>> offers;
EXPECT_CALL(sched, resourceOffers(&driver, _))
.WillOnce(FutureArg<1>(&offers))
.WillRepeatedly(Return()); // Ignore subsequent offers.
@@ -2241,7 +2241,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_Default_CMD_Override)
EXPECT_CALL(sched, registered(&driver, _, _))
.WillOnce(FutureArg<1>(&frameworkId));
- Future<vector<Offer> > offers;
+ Future<vector<Offer>> offers;
EXPECT_CALL(sched, resourceOffers(&driver, _))
.WillOnce(FutureArg<1>(&offers))
.WillRepeatedly(Return()); // Ignore subsequent offers.
@@ -2377,7 +2377,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_Default_CMD_Args)
EXPECT_CALL(sched, registered(&driver, _, _))
.WillOnce(FutureArg<1>(&frameworkId));
- Future<vector<Offer> > offers;
+ Future<vector<Offer>> offers;
EXPECT_CALL(sched, resourceOffers(&driver, _))
.WillOnce(FutureArg<1>(&offers))
.WillRepeatedly(Return()); // Ignore subsequent offers.
@@ -2515,7 +2515,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_SlaveRecoveryTaskContainer)
EXPECT_CALL(sched, registered(&driver, _, _))
.WillOnce(FutureArg<1>(&frameworkId));
- Future<vector<Offer> > offers;
+ Future<vector<Offer>> offers;
EXPECT_CALL(sched, resourceOffers(&driver, _))
.WillOnce(FutureArg<1>(&offers))
.WillRepeatedly(Return()); // Ignore subsequent offers.
@@ -2678,7 +2678,7 @@ TEST_F(DockerContainerizerTest,
EXPECT_CALL(sched, registered(&driver, _, _))
.WillOnce(FutureArg<1>(&frameworkId));
- Future<vector<Offer> > offers;
+ Future<vector<Offer>> offers;
EXPECT_CALL(sched, resourceOffers(&driver, _))
.WillOnce(FutureArg<1>(&offers))
.WillRepeatedly(Return()); // Ignore subsequent offers.
@@ -2853,7 +2853,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_NC_PortMapping)
EXPECT_CALL(sched, registered(&driver, _, _))
.WillOnce(FutureArg<1>(&frameworkId));
- Future<vector<Offer> > offers;
+ Future<vector<Offer>> offers;
EXPECT_CALL(sched, resourceOffers(&driver, _))
.WillOnce(FutureArg<1>(&offers))
.WillRepeatedly(Return()); // Ignore subsequent offers.
@@ -3000,7 +3000,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_LaunchSandboxWithColon)
EXPECT_CALL(sched, registered(&driver, _, _))
.WillOnce(FutureArg<1>(&frameworkId));
- Future<vector<Offer> > offers;
+ Future<vector<Offer>> offers;
EXPECT_CALL(sched, resourceOffers(&driver, _))
.WillOnce(FutureArg<1>(&offers))
.WillRepeatedly(Return()); // Ignore subsequent offers.
@@ -3118,7 +3118,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_DestroyWhileFetching)
EXPECT_CALL(sched, registered(&driver, _, _))
.WillOnce(FutureArg<1>(&frameworkId));
- Future<vector<Offer> > offers;
+ Future<vector<Offer>> offers;
EXPECT_CALL(sched, resourceOffers(&driver, _))
.WillOnce(FutureArg<1>(&offers))
.WillRepeatedly(Return()); // Ignore subsequent offers.
@@ -3238,7 +3238,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_DestroyWhilePulling)
EXPECT_CALL(sched, registered(&driver, _, _))
.WillOnce(FutureArg<1>(&frameworkId));
- Future<vector<Offer> > offers;
+ Future<vector<Offer>> offers;
EXPECT_CALL(sched, resourceOffers(&driver, _))
.WillOnce(FutureArg<1>(&offers))
.WillRepeatedly(Return()); // Ignore subsequent offers.
http://git-wip-us.apache.org/repos/asf/mesos/blob/bea8c3c9/src/tests/containerizer/docker_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/containerizer/docker_tests.cpp b/src/tests/containerizer/docker_tests.cpp
index 7b73a49..e9a214a 100644
--- a/src/tests/containerizer/docker_tests.cpp
+++ b/src/tests/containerizer/docker_tests.cpp
@@ -102,7 +102,7 @@ TEST_F(DockerTest, ROOT_DOCKER_interface)
false).get();
// Verify that we do not see the container.
- Future<list<Docker::Container> > containers = docker->ps(true, containerName);
+ Future<list<Docker::Container>> containers = docker->ps(true, containerName);
AWAIT_READY(containers);
foreach (const Docker::Container& container, containers.get()) {
EXPECT_NE("/" + containerName, container.name);
http://git-wip-us.apache.org/repos/asf/mesos/blob/bea8c3c9/src/tests/containerizer/isolator_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/containerizer/isolator_tests.cpp b/src/tests/containerizer/isolator_tests.cpp
index 827c9f0..4f047ae 100644
--- a/src/tests/containerizer/isolator_tests.cpp
+++ b/src/tests/containerizer/isolator_tests.cpp
@@ -281,7 +281,7 @@ TYPED_TEST(CpuIsolatorTest, UserCpuUsage)
ASSERT_SOME(pid);
// Reap the forked child.
- Future<Option<int> > status = process::reap(pid.get());
+ Future<Option<int>> status = process::reap(pid.get());
// Wait for the command to start.
while (!os::exists(file));
@@ -394,7 +394,7 @@ TYPED_TEST(CpuIsolatorTest, SystemCpuUsage)
ASSERT_SOME(pid);
// Reap the forked child.
- Future<Option<int> > status = process::reap(pid.get());
+ Future<Option<int>> status = process::reap(pid.get());
// Wait for the command to start.
while (!os::exists(file));
@@ -677,7 +677,7 @@ TEST_F(LimitedCpuIsolatorTest, ROOT_CGROUPS_CFS_Enable_Cfs)
ASSERT_SOME(pid);
// Reap the forked child.
- Future<Option<int> > status = process::reap(pid.get());
+ Future<Option<int>> status = process::reap(pid.get());
// Wait for the command to complete.
AWAIT_READY(status);
@@ -782,7 +782,7 @@ TEST_F(LimitedCpuIsolatorTest, ROOT_CGROUPS_CFS_Big_Quota)
ASSERT_SOME(pid);
// Reap the forked child.
- Future<Option<int> > status = process::reap(pid.get());
+ Future<Option<int>> status = process::reap(pid.get());
// Wait for the command to complete successfully.
AWAIT_READY(status);
@@ -1341,7 +1341,7 @@ TEST_F(SharedFilesystemIsolatorTest, DISABLED_ROOT_RelativeVolume)
containerConfig.mutable_executor_info()->CopyFrom(executorInfo);
containerConfig.set_directory(flags.work_dir);
- Future<Option<ContainerLaunchInfo> > prepare =
+ Future<Option<ContainerLaunchInfo>> prepare =
isolator->prepare(
containerId,
containerConfig);
@@ -1377,7 +1377,7 @@ TEST_F(SharedFilesystemIsolatorTest, DISABLED_ROOT_RelativeVolume)
ASSERT_SOME(pid);
// Set up the reaper to wait on the forked child.
- Future<Option<int> > status = process::reap(pid.get());
+ Future<Option<int>> status = process::reap(pid.get());
AWAIT_READY(status);
EXPECT_SOME_EQ(0, status.get());
@@ -1447,7 +1447,7 @@ TEST_F(SharedFilesystemIsolatorTest, DISABLED_ROOT_AbsoluteVolume)
containerConfig.mutable_executor_info()->CopyFrom(executorInfo);
containerConfig.set_directory(flags.work_dir);
- Future<Option<ContainerLaunchInfo> > prepare =
+ Future<Option<ContainerLaunchInfo>> prepare =
isolator->prepare(
containerId,
containerConfig);
@@ -1483,7 +1483,7 @@ TEST_F(SharedFilesystemIsolatorTest, DISABLED_ROOT_AbsoluteVolume)
ASSERT_SOME(pid);
// Set up the reaper to wait on the forked child.
- Future<Option<int> > status = process::reap(pid.get());
+ Future<Option<int>> status = process::reap(pid.get());
AWAIT_READY(status);
EXPECT_SOME_EQ(0, status.get());
http://git-wip-us.apache.org/repos/asf/mesos/blob/bea8c3c9/src/tests/containerizer/launcher.hpp
----------------------------------------------------------------------
diff --git a/src/tests/containerizer/launcher.hpp b/src/tests/containerizer/launcher.hpp
index 49f8ecb..7e5c243 100644
--- a/src/tests/containerizer/launcher.hpp
+++ b/src/tests/containerizer/launcher.hpp
@@ -66,7 +66,7 @@ public:
const process::Subprocess::IO& out,
const process::Subprocess::IO& err,
const Option<flags::FlagsBase>& flags,
- const Option<std::map<std::string, std::string> >& env,
+ const Option<std::map<std::string, std::string>>& env,
const Option<int>& namespaces,
std::vector<process::Subprocess::Hook> parentHooks));
http://git-wip-us.apache.org/repos/asf/mesos/blob/bea8c3c9/src/tests/containerizer/port_mapping_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/containerizer/port_mapping_tests.cpp b/src/tests/containerizer/port_mapping_tests.cpp
index dddcb63..fd181ca 100644
--- a/src/tests/containerizer/port_mapping_tests.cpp
+++ b/src/tests/containerizer/port_mapping_tests.cpp
@@ -155,7 +155,7 @@ static void cleanup(const string& eth0, const string& lo)
}
// Clean up all 'veth' devices if exist.
- Try<set<string> > links = net::links();
+ Try<set<string>> links = net::links();
ASSERT_SOME(links);
foreach (const string& name, links.get()) {
@@ -165,7 +165,7 @@ static void cleanup(const string& eth0, const string& lo)
}
if (os::exists(slave::PORT_MAPPING_BIND_MOUNT_ROOT())) {
- Try<list<string> > entries = os::ls(slave::PORT_MAPPING_BIND_MOUNT_ROOT());
+ Try<list<string>> entries = os::ls(slave::PORT_MAPPING_BIND_MOUNT_ROOT());
ASSERT_SOME(entries);
foreach (const string& file, entries.get()) {
@@ -382,7 +382,7 @@ protected:
CHECK_SOME(s);
- Future<Option<int> > status = s.get().status();
+ Future<Option<int>> status = s.get().status();
AWAIT_EXPECT_READY(status);
EXPECT_SOME_EQ(0, status.get());
@@ -505,7 +505,7 @@ TEST_F(PortMappingIsolatorTest, ROOT_NC_ContainerToContainerTCP)
ASSERT_SOME(pid);
// Reap the forked child.
- Future<Option<int> > status1 = process::reap(pid.get());
+ Future<Option<int>> status1 = process::reap(pid.get());
// Continue in the parent.
::close(pipes[0]);
@@ -569,7 +569,7 @@ TEST_F(PortMappingIsolatorTest, ROOT_NC_ContainerToContainerTCP)
ASSERT_SOME(pid);
// Reap the forked child.
- Future<Option<int> > status2 = process::reap(pid.get());
+ Future<Option<int>> status2 = process::reap(pid.get());
// Continue in the parent.
::close(pipes[0]);
@@ -668,7 +668,7 @@ TEST_F(PortMappingIsolatorTest, ROOT_NC_ContainerToContainerUDP)
ASSERT_SOME(pid);
// Reap the forked child.
- Future<Option<int> > status1 = process::reap(pid.get());
+ Future<Option<int>> status1 = process::reap(pid.get());
// Continue in the parent.
::close(pipes[0]);
@@ -734,7 +734,7 @@ TEST_F(PortMappingIsolatorTest, ROOT_NC_ContainerToContainerUDP)
ASSERT_SOME(pid);
// Reap the forked child.
- Future<Option<int> > status2 = process::reap(pid.get());
+ Future<Option<int>> status2 = process::reap(pid.get());
// Continue in the parent.
::close(pipes[0]);
@@ -834,7 +834,7 @@ TEST_F(PortMappingIsolatorTest, ROOT_NC_HostToContainerUDP)
ASSERT_SOME(pid);
// Reap the forked child.
- Future<Option<int> > status = process::reap(pid.get());
+ Future<Option<int>> status = process::reap(pid.get());
// Continue in the parent.
::close(pipes[0]);
@@ -952,7 +952,7 @@ TEST_F(PortMappingIsolatorTest, ROOT_NC_HostToContainerTCP)
ASSERT_SOME(pid);
// Reap the forked child.
- Future<Option<int> > status = process::reap(pid.get());
+ Future<Option<int>> status = process::reap(pid.get());
// Continue in the parent.
::close(pipes[0]);
@@ -1071,7 +1071,7 @@ TEST_F(PortMappingIsolatorTest, ROOT_ContainerICMPExternal)
ASSERT_SOME(pid);
// Reap the forked child.
- Future<Option<int> > status = process::reap(pid.get());
+ Future<Option<int>> status = process::reap(pid.get());
// Continue in the parent.
::close(pipes[0]);
@@ -1152,7 +1152,7 @@ TEST_F(PortMappingIsolatorTest, ROOT_ContainerICMPInternal)
ASSERT_SOME(pid);
// Reap the forked child.
- Future<Option<int> > status = process::reap(pid.get());
+ Future<Option<int>> status = process::reap(pid.get());
// Continue in the parent.
::close(pipes[0]);
@@ -1249,7 +1249,7 @@ TEST_F(PortMappingIsolatorTest, ROOT_ContainerARPExternal)
ASSERT_SOME(pid);
// Reap the forked child.
- Future<Option<int> > status = process::reap(pid.get());
+ Future<Option<int>> status = process::reap(pid.get());
// Continue in the parent.
::close(pipes[0]);
@@ -1344,7 +1344,7 @@ TEST_F(PortMappingIsolatorTest, ROOT_DNS)
ASSERT_SOME(pid);
// Reap the forked child.
- Future<Option<int> > status = process::reap(pid.get());
+ Future<Option<int>> status = process::reap(pid.get());
// Continue in the parent.
::close(pipes[0]);
@@ -1429,7 +1429,7 @@ TEST_F(PortMappingIsolatorTest, ROOT_TooManyContainers)
ASSERT_SOME(pid);
// Reap the forked child.
- Future<Option<int> > status1 = process::reap(pid.get());
+ Future<Option<int>> status1 = process::reap(pid.get());
// Continue in the parent.
::close(pipes[0]);
@@ -1561,7 +1561,7 @@ TEST_F(PortMappingIsolatorTest, ROOT_NC_SmallEgressLimit)
ASSERT_SOME(pid);
// Reap the forked child.
- Future<Option<int> > reap = process::reap(pid.get());
+ Future<Option<int>> reap = process::reap(pid.get());
// Continue in the parent.
::close(pipes[0]);
@@ -1595,7 +1595,7 @@ TEST_F(PortMappingIsolatorTest, ROOT_NC_SmallEgressLimit)
ASSERT_GT(time.get(), (size.bytes() / rate.bytes()));
// Make sure the nc server exits normally.
- Future<Option<int> > status = s.get().status();
+ Future<Option<int>> status = s.get().status();
AWAIT_READY(status);
EXPECT_SOME_EQ(0, status.get());
@@ -1725,7 +1725,7 @@ TEST_F(PortMappingIsolatorTest, ROOT_NC_PortMappingStatistics)
ASSERT_SOME(pid);
// Reap the forked child.
- Future<Option<int> > reap = process::reap(pid.get());
+ Future<Option<int>> reap = process::reap(pid.get());
// Continue in the parent.
::close(pipes[0]);
@@ -1791,7 +1791,7 @@ TEST_F(PortMappingIsolatorTest, ROOT_NC_PortMappingStatistics)
ASSERT_TRUE(waitForFileCreation(container1Ready));
// Make sure the nc server exits normally.
- Future<Option<int> > status = s.get().status();
+ Future<Option<int>> status = s.get().status();
AWAIT_READY(status);
EXPECT_SOME_EQ(0, status.get());
@@ -1893,7 +1893,7 @@ TEST_F(PortMappingMesosTest, CGROUPS_ROOT_RecoverMixedContainers)
// NOTE: We set filter explicitly here so that the resources will
// not be filtered for 5 seconds (the default).
- Future<vector<Offer> > offers1;
+ Future<vector<Offer>> offers1;
EXPECT_CALL(sched, resourceOffers(_, _))
.WillOnce(FutureArg<1>(&offers1))
.WillRepeatedly(DeclineOffers(filters)); // Ignore subsequent offers.
@@ -1928,7 +1928,7 @@ TEST_F(PortMappingMesosTest, CGROUPS_ROOT_RecoverMixedContainers)
Future<SlaveReregisteredMessage> slaveReregisteredMessage1 =
FUTURE_PROTOBUF(SlaveReregisteredMessage(), _, _);
- Future<vector<Offer> > offers2;
+ Future<vector<Offer>> offers2;
EXPECT_CALL(sched, resourceOffers(_, _))
.WillOnce(FutureArg<1>(&offers2))
.WillRepeatedly(DeclineOffers(filters)); // Ignore subsequent offers.
@@ -2052,7 +2052,7 @@ TEST_F(PortMappingMesosTest, CGROUPS_ROOT_CleanUpOrphan)
EXPECT_CALL(sched, registered(_, _, _))
.WillOnce(FutureArg<1>(&frameworkId));
- Future<vector<Offer> > offers;
+ Future<vector<Offer>> offers;
EXPECT_CALL(sched, resourceOffers(_, _))
.WillOnce(FutureArg<1>(&offers))
.WillRepeatedly(DeclineOffers()); // Ignore subsequent offers.
@@ -2102,7 +2102,7 @@ TEST_F(PortMappingMesosTest, CGROUPS_ROOT_CleanUpOrphan)
Try<bool> hostLoExistsQdisc = ingress::exists(lo);
EXPECT_SOME_TRUE(hostLoExistsQdisc);
- Result<vector<ip::Classifier> > classifiers =
+ Result<vector<ip::Classifier>> classifiers =
ip::classifiers(eth0, ingress::HANDLE);
EXPECT_SOME(classifiers);
@@ -2113,14 +2113,14 @@ TEST_F(PortMappingMesosTest, CGROUPS_ROOT_CleanUpOrphan)
EXPECT_EQ(0u, classifiers.get().size());
// Expect no 'veth' devices.
- Try<set<string> > links = net::links();
+ Try<set<string>> links = net::links();
ASSERT_SOME(links);
foreach (const string& name, links.get()) {
EXPECT_FALSE(strings::startsWith(name, slave::PORT_MAPPING_VETH_PREFIX()));
}
// Expect no files in bind mount directory.
- Try<list<string> > files = os::ls(slave::PORT_MAPPING_BIND_MOUNT_ROOT());
+ Try<list<string>> files = os::ls(slave::PORT_MAPPING_BIND_MOUNT_ROOT());
ASSERT_SOME(files);
EXPECT_EQ(0u, files.get().size());
@@ -2158,7 +2158,7 @@ TEST_F(PortMappingMesosTest, ROOT_NetworkNamespaceHandleSymlink)
EXPECT_CALL(sched, registered(_, _, _));
- Future<vector<Offer> > offers;
+ Future<vector<Offer>> offers;
EXPECT_CALL(sched, resourceOffers(_, _))
.WillOnce(FutureArg<1>(&offers))
.WillRepeatedly(DeclineOffers()); // Ignore subsequent offers.
@@ -2247,7 +2247,7 @@ TEST_F(PortMappingMesosTest, CGROUPS_ROOT_RecoverMixedKnownAndUnKnownOrphans)
EXPECT_CALL(sched, registered(_, _, _));
- Future<vector<Offer> > offers;
+ Future<vector<Offer>> offers;
EXPECT_CALL(sched, resourceOffers(_, _))
.WillOnce(FutureArg<1>(&offers))
.WillRepeatedly(DeclineOffers()); // Ignore subsequent offers.
http://git-wip-us.apache.org/repos/asf/mesos/blob/bea8c3c9/src/tests/disk_quota_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/disk_quota_tests.cpp b/src/tests/disk_quota_tests.cpp
index f379a6e..e7cf66f 100644
--- a/src/tests/disk_quota_tests.cpp
+++ b/src/tests/disk_quota_tests.cpp
@@ -376,7 +376,7 @@ TEST_F(DiskQuotaTest, NoQuotaEnforcement)
EXPECT_CALL(sched, registered(_, _, _));
- Future<vector<Offer> > offers;
+ Future<vector<Offer>> offers;
EXPECT_CALL(sched, resourceOffers(_, _))
.WillOnce(FutureArg<1>(&offers))
.WillRepeatedly(Return()); // Ignore subsequent offers.
@@ -473,7 +473,7 @@ TEST_F(DiskQuotaTest, ResourceStatistics)
EXPECT_CALL(sched, registered(_, _, _));
- Future<vector<Offer> > offers;
+ Future<vector<Offer>> offers;
EXPECT_CALL(sched, resourceOffers(_, _))
.WillOnce(FutureArg<1>(&offers))
.WillRepeatedly(Return()); // Ignore subsequent offers.
@@ -570,7 +570,7 @@ TEST_F(DiskQuotaTest, SlaveRecovery)
EXPECT_CALL(sched, registered(_, _, _));
- Future<vector<Offer> > offers;
+ Future<vector<Offer>> offers;
EXPECT_CALL(sched, resourceOffers(_, _))
.WillOnce(FutureArg<1>(&offers))
.WillRepeatedly(Return()); // Ignore subsequent offers.
http://git-wip-us.apache.org/repos/asf/mesos/blob/bea8c3c9/src/tests/environment.cpp
----------------------------------------------------------------------
diff --git a/src/tests/environment.cpp b/src/tests/environment.cpp
index 6960c2a..7f144f1 100644
--- a/src/tests/environment.cpp
+++ b/src/tests/environment.cpp
@@ -172,7 +172,7 @@ public:
CgroupsFilter()
{
#ifdef __linux__
- Try<set<string> > hierarchies = cgroups::hierarchies();
+ Try<set<string>> hierarchies = cgroups::hierarchies();
if (hierarchies.isError()) {
std::cerr
<< "-------------------------------------------------------------\n"
@@ -678,7 +678,7 @@ private:
// Return list of disabled tests based on test name based filters.
static vector<string> disabled(
const ::testing::UnitTest* unitTest,
- const vector<Owned<TestFilter> >& filters)
+ const vector<Owned<TestFilter>>& filters)
{
vector<string> disabled;
@@ -739,7 +739,7 @@ Environment::Environment(const Flags& _flags) : flags(_flags)
disabled += ":";
}
- vector<Owned<TestFilter> > filters;
+ vector<Owned<TestFilter>> filters;
filters.push_back(Owned<TestFilter>(new AufsFilter()));
filters.push_back(Owned<TestFilter>(new BenchmarkFilter()));
http://git-wip-us.apache.org/repos/asf/mesos/blob/bea8c3c9/src/tests/exception_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/exception_tests.cpp b/src/tests/exception_tests.cpp
index a9b1c23..7b66bd1 100644
--- a/src/tests/exception_tests.cpp
+++ b/src/tests/exception_tests.cpp
@@ -151,7 +151,7 @@ TEST_F(ExceptionTest, DisallowSchedulerCallbacksOnAbort)
EXPECT_CALL(sched, registered(&driver, _, _))
.Times(1);
- Future<vector<Offer> > offers;
+ Future<vector<Offer>> offers;
EXPECT_CALL(sched, resourceOffers(&driver, _))
.WillOnce(FutureArg<1>(&offers))
.WillRepeatedly(Return());
http://git-wip-us.apache.org/repos/asf/mesos/blob/bea8c3c9/src/tests/health_check_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/health_check_tests.cpp b/src/tests/health_check_tests.cpp
index 47c35d1..3b44d80 100644
--- a/src/tests/health_check_tests.cpp
+++ b/src/tests/health_check_tests.cpp
@@ -188,7 +188,7 @@ TEST_F(HealthCheckTest, HealthyTask)
EXPECT_CALL(sched, registered(&driver, _, _))
.Times(1);
- Future<vector<Offer> > offers;
+ Future<vector<Offer>> offers;
EXPECT_CALL(sched, resourceOffers(&driver, _))
.WillOnce(FutureArg<1>(&offers))
.WillRepeatedly(Return()); // Ignore subsequent offers.
@@ -328,7 +328,7 @@ TEST_F(HealthCheckTest, ROOT_HealthyTaskWithContainerImage)
EXPECT_CALL(sched, registered(&driver, _, _))
.Times(1);
- Future<vector<Offer> > offers;
+ Future<vector<Offer>> offers;
EXPECT_CALL(sched, resourceOffers(&driver, _))
.WillOnce(FutureArg<1>(&offers))
.WillRepeatedly(Return()); // Ignore subsequent offers.
@@ -561,7 +561,7 @@ TEST_F(HealthCheckTest, HealthyTaskNonShell)
EXPECT_CALL(sched, registered(&driver, _, _))
.Times(1);
- Future<vector<Offer> > offers;
+ Future<vector<Offer>> offers;
EXPECT_CALL(sched, resourceOffers(&driver, _))
.WillOnce(FutureArg<1>(&offers))
.WillRepeatedly(Return()); // Ignore subsequent offers.
@@ -629,7 +629,7 @@ TEST_F(HealthCheckTest, HealthStatusChange)
EXPECT_CALL(sched, registered(&driver, _, _));
- Future<vector<Offer> > offers;
+ Future<vector<Offer>> offers;
EXPECT_CALL(sched, resourceOffers(&driver, _))
.WillOnce(FutureArg<1>(&offers))
.WillRepeatedly(Return()); // Ignore subsequent offers.
@@ -984,7 +984,7 @@ TEST_F(HealthCheckTest, ConsecutiveFailures)
EXPECT_CALL(sched, registered(&driver, _, _))
.Times(1);
- Future<vector<Offer> > offers;
+ Future<vector<Offer>> offers;
EXPECT_CALL(sched, resourceOffers(&driver, _))
.WillOnce(FutureArg<1>(&offers))
.WillRepeatedly(Return()); // Ignore subsequent offers.
@@ -1074,7 +1074,7 @@ TEST_F(HealthCheckTest, EnvironmentSetup)
EXPECT_CALL(sched, registered(&driver, _, _))
.Times(1);
- Future<vector<Offer> > offers;
+ Future<vector<Offer>> offers;
EXPECT_CALL(sched, resourceOffers(&driver, _))
.WillOnce(FutureArg<1>(&offers))
.WillRepeatedly(Return()); // Ignore subsequent offers.
@@ -1141,7 +1141,7 @@ TEST_F(HealthCheckTest, DISABLED_GracePeriod)
EXPECT_CALL(sched, registered(&driver, _, _))
.Times(1);
- Future<vector<Offer> > offers;
+ Future<vector<Offer>> offers;
EXPECT_CALL(sched, resourceOffers(&driver, _))
.WillOnce(FutureArg<1>(&offers))
.WillRepeatedly(Return()); // Ignore subsequent offers.
http://git-wip-us.apache.org/repos/asf/mesos/blob/bea8c3c9/src/tests/master_allocator_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/master_allocator_tests.cpp b/src/tests/master_allocator_tests.cpp
index 32e3a46..7eed672 100644
--- a/src/tests/master_allocator_tests.cpp
+++ b/src/tests/master_allocator_tests.cpp
@@ -748,7 +748,7 @@ TYPED_TEST(MasterAllocatorTest, SlaveLost)
// Eventually after slave2 is launched, we should get
// an offer that contains all of slave2's resources
// and none of slave1's resources.
- Future<vector<Offer> > resourceOffers;
+ Future<vector<Offer>> resourceOffers;
EXPECT_CALL(sched, resourceOffers(_, OfferEq(3, 256)))
.WillOnce(FutureArg<1>(&resourceOffers));
http://git-wip-us.apache.org/repos/asf/mesos/blob/bea8c3c9/src/tests/master_authorization_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/master_authorization_tests.cpp b/src/tests/master_authorization_tests.cpp
index 16f1ab4..92bd2a9 100644
--- a/src/tests/master_authorization_tests.cpp
+++ b/src/tests/master_authorization_tests.cpp
@@ -125,7 +125,7 @@ TEST_F(MasterAuthorizationTest, AuthorizedTask)
EXPECT_CALL(sched, registered(&driver, _, _))
.Times(1);
- Future<vector<Offer> > offers;
+ Future<vector<Offer>> offers;
EXPECT_CALL(sched, resourceOffers(&driver, _))
.WillOnce(FutureArg<1>(&offers))
.WillRepeatedly(Return()); // Ignore subsequent offers.
@@ -199,7 +199,7 @@ TEST_F(MasterAuthorizationTest, UnauthorizedTask)
EXPECT_CALL(sched, registered(&driver, _, _))
.Times(1);
- Future<vector<Offer> > offers;
+ Future<vector<Offer>> offers;
EXPECT_CALL(sched, resourceOffers(&driver, _))
.WillOnce(FutureArg<1>(&offers))
.WillRepeatedly(Return()); // Ignore subsequent offers.
@@ -254,7 +254,7 @@ TEST_F(MasterAuthorizationTest, KillTask)
EXPECT_CALL(sched, registered(&driver, _, _))
.Times(1);
- Future<vector<Offer> > offers;
+ Future<vector<Offer>> offers;
EXPECT_CALL(sched, resourceOffers(&driver, _))
.WillOnce(FutureArg<1>(&offers))
.WillRepeatedly(Return()); // Ignore subsequent offers.
@@ -326,7 +326,7 @@ TEST_F(MasterAuthorizationTest, SlaveRemoved)
EXPECT_CALL(sched, registered(&driver, _, _))
.Times(1);
- Future<vector<Offer> > offers;
+ Future<vector<Offer>> offers;
EXPECT_CALL(sched, resourceOffers(&driver, _))
.WillOnce(FutureArg<1>(&offers))
.WillRepeatedly(Return()); // Ignore subsequent offers.
@@ -418,7 +418,7 @@ TEST_F(MasterAuthorizationTest, SlaveDisconnected)
EXPECT_CALL(sched, registered(&driver, _, _))
.Times(1);
- Future<vector<Offer> > offers;
+ Future<vector<Offer>> offers;
EXPECT_CALL(sched, resourceOffers(&driver, _))
.WillOnce(FutureArg<1>(&offers))
.WillRepeatedly(Return()); // Ignore subsequent offers.
@@ -514,7 +514,7 @@ TEST_F(MasterAuthorizationTest, FrameworkRemoved)
EXPECT_CALL(sched, registered(&driver, _, _))
.Times(1);
- Future<vector<Offer> > offers;
+ Future<vector<Offer>> offers;
EXPECT_CALL(sched, resourceOffers(&driver, _))
.WillOnce(FutureArg<1>(&offers))
.WillRepeatedly(Return()); // Ignore subsequent offers.
@@ -580,7 +580,7 @@ TEST_F(MasterAuthorizationTest, PendingExecutorInfoDiffersOnDifferentSlaves)
AWAIT_READY(registered);
- Future<vector<Offer> > offers1;
+ Future<vector<Offer>> offers1;
EXPECT_CALL(sched, resourceOffers(&driver, _))
.WillOnce(FutureArg<1>(&offers1));
@@ -616,7 +616,7 @@ TEST_F(MasterAuthorizationTest, PendingExecutorInfoDiffersOnDifferentSlaves)
// Wait until authorization is in progress.
AWAIT_READY(authorize);
- Future<vector<Offer> > offers2;
+ Future<vector<Offer>> offers2;
EXPECT_CALL(sched, resourceOffers(&driver, _))
.WillOnce(FutureArg<1>(&offers2))
.WillRepeatedly(Return()); // Ignore subsequent offers.