You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by ne...@apache.org on 2017/04/11 20:35:32 UTC
[3/6] mesos git commit: Fixed whitespace in Mesos.
Fixed whitespace in Mesos.
Review: https://reviews.apache.org/r/57512
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/f7c5dd1d
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/f7c5dd1d
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/f7c5dd1d
Branch: refs/heads/master
Commit: f7c5dd1d696d8af0b4caad617ceca1af3733fef2
Parents: 918a892
Author: Neil Conway <ne...@gmail.com>
Authored: Fri Mar 10 11:47:27 2017 -0500
Committer: Neil Conway <ne...@gmail.com>
Committed: Tue Apr 11 13:11:20 2017 -0700
----------------------------------------------------------------------
src/common/command_utils.cpp | 2 +-
src/common/http.cpp | 2 +-
src/docker/docker.cpp | 2 +-
src/linux/fs.cpp | 2 +-
src/master/master.cpp | 2 +-
src/slave/containerizer/docker.cpp | 2 +-
src/slave/containerizer/mesos/containerizer.cpp | 4 ++--
src/slave/containerizer/mesos/isolators/network/cni/cni.cpp | 2 +-
src/slave/containerizer/mesos/isolators/network/port_mapping.cpp | 4 ++--
src/slave/containerizer/mesos/provisioner/backends/overlay.cpp | 2 +-
src/slave/http.cpp | 2 +-
src/tests/api_tests.cpp | 4 ++--
src/tests/master_allocator_tests.cpp | 2 +-
src/tests/persistent_volume_endpoints_tests.cpp | 4 ++--
src/uri/fetcher.cpp | 2 +-
15 files changed, 19 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/f7c5dd1d/src/common/command_utils.cpp
----------------------------------------------------------------------
diff --git a/src/common/command_utils.cpp b/src/common/command_utils.cpp
index d5f0dff..c50be76 100644
--- a/src/common/command_utils.cpp
+++ b/src/common/command_utils.cpp
@@ -191,7 +191,7 @@ Future<string> sha512(const Path& input)
vector<string> tokens = strings::tokenize(output, " ");
if (tokens.size() < 2) {
return Failure(
- "Failed to parse '" + output + "' from '" + cmd + "' command");
+ "Failed to parse '" + output + "' from '" + cmd + "' command");
}
// TODO(jojy): Check the size of tokens[0].
http://git-wip-us.apache.org/repos/asf/mesos/blob/f7c5dd1d/src/common/http.cpp
----------------------------------------------------------------------
diff --git a/src/common/http.cpp b/src/common/http.cpp
index 92f0636..167dce2 100644
--- a/src/common/http.cpp
+++ b/src/common/http.cpp
@@ -935,7 +935,7 @@ process::Future<bool> authorizeEndpoint(
LOG(INFO) << "Authorizing principal '"
<< (principal.isSome() ? stringify(principal.get()) : "ANY")
- << "' to " << method
+ << "' to " << method
<< " the '" << endpoint << "' endpoint";
return authorizer.get()->authorized(request);
http://git-wip-us.apache.org/repos/asf/mesos/blob/f7c5dd1d/src/docker/docker.cpp
----------------------------------------------------------------------
diff --git a/src/docker/docker.cpp b/src/docker/docker.cpp
index 3b934d9..236443e 100755
--- a/src/docker/docker.cpp
+++ b/src/docker/docker.cpp
@@ -1534,7 +1534,7 @@ Future<Docker::Image> Docker::___pull(
Option<int> status = s.status().get();
if (!status.isSome()) {
- return Failure("No status found from '" + cmd + "'");
+ return Failure("No status found from '" + cmd + "'");
} else if (status.get() != 0) {
return io::read(s.err().get())
.then(lambda::bind(&failure<Image>, cmd, status.get(), lambda::_1));
http://git-wip-us.apache.org/repos/asf/mesos/blob/f7c5dd1d/src/linux/fs.cpp
----------------------------------------------------------------------
diff --git a/src/linux/fs.cpp b/src/linux/fs.cpp
index c0b8cc3..944509f 100644
--- a/src/linux/fs.cpp
+++ b/src/linux/fs.cpp
@@ -555,7 +555,7 @@ Try<Nothing> copyDeviceNode(const string& source, const string& target)
Try<Nothing> mknod = os::mknod(target, mode.get(), dev.get());
if (mknod.isError()) {
- return Error("Failed to create device:" + mknod.error());
+ return Error("Failed to create device:" + mknod.error());
}
Try<Nothing> chmod = os::chmod(target, mode.get());
http://git-wip-us.apache.org/repos/asf/mesos/blob/f7c5dd1d/src/master/master.cpp
----------------------------------------------------------------------
diff --git a/src/master/master.cpp b/src/master/master.cpp
index c1f3c4f..0f4c64c 100644
--- a/src/master/master.cpp
+++ b/src/master/master.cpp
@@ -6113,7 +6113,7 @@ void Master::updateSlave(
Slave* slave = CHECK_NOTNULL(slaves.registered.get(slaveId));
LOG(INFO) << "Received update of agent " << *slave << " with total"
- << " oversubscribed resources " << oversubscribedResources;
+ << " oversubscribed resources " << oversubscribedResources;
// NOTE: We must *first* update the agent's resources before we
// recover the resources. If we recovered the resources first,
http://git-wip-us.apache.org/repos/asf/mesos/blob/f7c5dd1d/src/slave/containerizer/docker.cpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/docker.cpp b/src/slave/containerizer/docker.cpp
index be1a298..06751f1 100644
--- a/src/slave/containerizer/docker.cpp
+++ b/src/slave/containerizer/docker.cpp
@@ -768,7 +768,7 @@ Try<Nothing> DockerContainerizerProcess::checkpoint(
container->executor.executor_id(),
containerId);
- LOG(INFO) << "Checkpointing pid " << pid << " to '" << path << "'";
+ LOG(INFO) << "Checkpointing pid " << pid << " to '" << path << "'";
return slave::state::checkpoint(path, stringify(pid));
}
http://git-wip-us.apache.org/repos/asf/mesos/blob/f7c5dd1d/src/slave/containerizer/mesos/containerizer.cpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/mesos/containerizer.cpp b/src/slave/containerizer/mesos/containerizer.cpp
index bc611a5..56db7eb 100644
--- a/src/slave/containerizer/mesos/containerizer.cpp
+++ b/src/slave/containerizer/mesos/containerizer.cpp
@@ -1596,7 +1596,7 @@ Future<bool> MesosContainerizerProcess::_launch(
containerId);
LOG(INFO) << "Checkpointing container's forked pid " << pid
- << " to '" << path << "'";
+ << " to '" << path << "'";
Try<Nothing> checkpointed =
slave::state::checkpoint(path, stringify(pid));
@@ -2354,7 +2354,7 @@ void MesosContainerizerProcess::______destroy(
path::join(runtimePath, containerizer::paths::TERMINATION_FILE);
LOG(INFO) << "Checkpointing termination state to nested container's"
- << " runtime directory '" << terminationPath << "'";
+ << " runtime directory '" << terminationPath << "'";
Try<Nothing> checkpointed =
slave::state::checkpoint(terminationPath, termination);
http://git-wip-us.apache.org/repos/asf/mesos/blob/f7c5dd1d/src/slave/containerizer/mesos/isolators/network/cni/cni.cpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/mesos/isolators/network/cni/cni.cpp b/src/slave/containerizer/mesos/isolators/network/cni/cni.cpp
index d03c14c..3aecd8c 100644
--- a/src/slave/containerizer/mesos/isolators/network/cni/cni.cpp
+++ b/src/slave/containerizer/mesos/isolators/network/cni/cni.cpp
@@ -1727,7 +1727,7 @@ Try<JSON::Object> NetworkCniIsolatorProcess::getNetworkConfigJSON(
if (_networkConfigs.isError()) {
return Error(
"Encountered error while loading CNI config during "
- "a cache-miss for CNI network '" + network +"': " +
+ "a cache-miss for CNI network '" + network + "': " +
_networkConfigs.error());
}
http://git-wip-us.apache.org/repos/asf/mesos/blob/f7c5dd1d/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 433299c..cd008aa 100644
--- a/src/slave/containerizer/mesos/isolators/network/port_mapping.cpp
+++ b/src/slave/containerizer/mesos/isolators/network/port_mapping.cpp
@@ -1157,7 +1157,7 @@ int PortMappingStatistics::execute()
Try<int64_t> val = numify<int64_t>(tokens[i]);
if (val.isError()) {
- cerr << "Failed to parse the statistics in " << fields[0]
+ cerr << "Failed to parse the statistics in " << fields[0]
<< val.error() << endl;
return 1;
}
@@ -2904,7 +2904,7 @@ Future<ContainerLimitation> PortMappingIsolatorProcess::watch(
if (unmanaged.contains(containerId)) {
LOG(WARNING) << "Ignoring watch for unmanaged container " << containerId;
} else if (!infos.contains(containerId)) {
- LOG(WARNING) << "Ignoring watch for unknown container " << containerId;
+ LOG(WARNING) << "Ignoring watch for unknown container " << containerId;
}
// Currently, we always return a pending future because limitation
http://git-wip-us.apache.org/repos/asf/mesos/blob/f7c5dd1d/src/slave/containerizer/mesos/provisioner/backends/overlay.cpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/mesos/provisioner/backends/overlay.cpp b/src/slave/containerizer/mesos/provisioner/backends/overlay.cpp
index 8bdcc52..9a92c85 100644
--- a/src/slave/containerizer/mesos/provisioner/backends/overlay.cpp
+++ b/src/slave/containerizer/mesos/provisioner/backends/overlay.cpp
@@ -272,7 +272,7 @@ Future<bool> OverlayBackendProcess::destroy(
// TODO(zhitao): This should be converted into a failure after
// deprecation cycle started by 1.1.0.
VLOG(1) << "Cannot find symlink to temporary directory '" << tempLink
- <<"' for image links";
+ << "' for image links";
return true;
}
http://git-wip-us.apache.org/repos/asf/mesos/blob/f7c5dd1d/src/slave/http.cpp
----------------------------------------------------------------------
diff --git a/src/slave/http.cpp b/src/slave/http.cpp
index b78854b..468cf33 100644
--- a/src/slave/http.cpp
+++ b/src/slave/http.cpp
@@ -521,7 +521,7 @@ Future<Response> Slave::Http::_api(
call.type() == mesos::agent::Call::ATTACH_CONTAINER_INPUT) {
return UnsupportedMediaType(
string("Expecting 'Content-Type' to be ") + APPLICATION_RECORDIO +
- " for " + stringify(call.type()) + " call");
+ " for " + stringify(call.type()) + " call");
}
LOG(INFO) << "Processing call " << call.type();
http://git-wip-us.apache.org/repos/asf/mesos/blob/f7c5dd1d/src/tests/api_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/api_tests.cpp b/src/tests/api_tests.cpp
index 29ae1bc..b801c8c 100644
--- a/src/tests/api_tests.cpp
+++ b/src/tests/api_tests.cpp
@@ -4114,7 +4114,7 @@ TEST_P_TEMP_DISABLED_ON_WINDOWS(AgentAPITest, LaunchNestedContainerSession)
string output = "output";
string error = "error";
- string command = "printf " + output + " && printf " + error + " 1>&2";
+ string command = "printf " + output + " && printf " + error + " 1>&2";
v1::agent::Call call;
call.set_type(v1::agent::Call::LAUNCH_NESTED_CONTAINER_SESSION);
@@ -4331,7 +4331,7 @@ TEST_P_TEMP_DISABLED_ON_WINDOWS(
string output = "output";
string error = "error";
- string command = "printf " + output + " && printf " + error + " 1>&2";
+ string command = "printf " + output + " && printf " + error + " 1>&2";
v1::agent::Call call;
call.set_type(v1::agent::Call::LAUNCH_NESTED_CONTAINER_SESSION);
http://git-wip-us.apache.org/repos/asf/mesos/blob/f7c5dd1d/src/tests/master_allocator_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/master_allocator_tests.cpp b/src/tests/master_allocator_tests.cpp
index 9f37502..119e318 100644
--- a/src/tests/master_allocator_tests.cpp
+++ b/src/tests/master_allocator_tests.cpp
@@ -129,7 +129,7 @@ public:
virtual void DescribeNegationTo(::std::ostream* os) const
{
- *os << "does not contain " << cpus << " cpus and " << mem << " mem";
+ *os << "does not contain " << cpus << " cpus and " << mem << " mem";
}
private:
http://git-wip-us.apache.org/repos/asf/mesos/blob/f7c5dd1d/src/tests/persistent_volume_endpoints_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/persistent_volume_endpoints_tests.cpp b/src/tests/persistent_volume_endpoints_tests.cpp
index d5fcdbf..1237d08 100644
--- a/src/tests/persistent_volume_endpoints_tests.cpp
+++ b/src/tests/persistent_volume_endpoints_tests.cpp
@@ -971,7 +971,7 @@ TEST_F(PersistentVolumeEndpointsTest, GoodCreateACLMultipleRoles)
// creation of a persistent volume.
slave::Flags slaveFlags = CreateSlaveFlags();
slaveFlags.resources =
- "cpus:1;mem:512;disk(" + AUTHORIZED_ROLE_1 +"):1024;disk(" +
+ "cpus:1;mem:512;disk(" + AUTHORIZED_ROLE_1 + "):1024;disk(" +
AUTHORIZED_ROLE_2 + "):1024";
Future<SlaveID> slaveId;
@@ -1185,7 +1185,7 @@ TEST_F(PersistentVolumeEndpointsTest, BadCreateACLMultipleRoles)
// creation of a persistent volume.
slave::Flags slaveFlags = CreateSlaveFlags();
slaveFlags.resources =
- "cpus:1;mem:512;disk(" + AUTHORIZED_ROLE +"):1024;disk(" +
+ "cpus:1;mem:512;disk(" + AUTHORIZED_ROLE + "):1024;disk(" +
UNAUTHORIZED_ROLE + "):1024";
Future<SlaveID> slaveId;
http://git-wip-us.apache.org/repos/asf/mesos/blob/f7c5dd1d/src/uri/fetcher.cpp
----------------------------------------------------------------------
diff --git a/src/uri/fetcher.cpp b/src/uri/fetcher.cpp
index 904fce5..f4d1a4c 100644
--- a/src/uri/fetcher.cpp
+++ b/src/uri/fetcher.cpp
@@ -66,7 +66,7 @@ Try<Owned<Fetcher>> create(const Option<Flags>& _flags)
if (plugin.isError()) {
// NOTE: We skip the plugin if it cannot be created, instead of
// returning an Error so that we can still use other plugins.
- LOG(INFO) << "Skipping URI fetcher plugin " << "'" << name << "' "
+ LOG(INFO) << "Skipping URI fetcher plugin " << "'" << name << "' "
<< "as it could not be created: " << plugin.error();
continue;
}