You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by vi...@apache.org on 2016/08/04 16:27:24 UTC
[1/2] mesos git commit: Mesos-slave --help should not return as
failed.
Repository: mesos
Updated Branches:
refs/heads/master 853821caf -> 335001ad2
Mesos-slave --help should not return as failed.
Doing a simple \`mesos-agent --help\` should return with exit_status=0.
It's not the case since work_dir is considered as mandatory.
Review: https://reviews.apache.org/r/50570/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/0984bdf5
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/0984bdf5
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/0984bdf5
Branch: refs/heads/master
Commit: 0984bdf553d12acfe4d54d9a6928b3eb1b54b611
Parents: 853821c
Author: Pierre Cheynier <me...@pierre-cheynier.net>
Authored: Thu Aug 4 09:26:57 2016 -0700
Committer: Vinod Kone <vi...@gmail.com>
Committed: Thu Aug 4 09:26:57 2016 -0700
----------------------------------------------------------------------
src/slave/main.cpp | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/0984bdf5/src/slave/main.cpp
----------------------------------------------------------------------
diff --git a/src/slave/main.cpp b/src/slave/main.cpp
index 42ca115..c355a3c 100644
--- a/src/slave/main.cpp
+++ b/src/slave/main.cpp
@@ -182,6 +182,11 @@ int main(int argc, char** argv)
Try<flags::Warnings> load = flags.load("MESOS_", argc, argv);
+ if (flags.help) {
+ cout << flags.usage() << endl;
+ return EXIT_SUCCESS;
+ }
+
// TODO(marco): this pattern too should be abstracted away
// in FlagsBase; I have seen it at least 15 times.
if (load.isError()) {
@@ -189,11 +194,6 @@ int main(int argc, char** argv)
return EXIT_FAILURE;
}
- if (flags.help) {
- cout << flags.usage() << endl;
- return EXIT_SUCCESS;
- }
-
if (flags.version) {
cout << "mesos" << " " << MESOS_VERSION << endl;
return EXIT_SUCCESS;
[2/2] mesos git commit: Moved check for '--version' in master and
agent 'main.cpp'.
Posted by vi...@apache.org.
Moved check for '--version' in master and agent 'main.cpp'.
The recent removal of the agent's default `work_dir`
requires us to check for the presence of the `--version`
flag before we check for errors in flag loading; this
patch makes that change, and also moves the
corresponding code in the master for consistency.
Review: https://reviews.apache.org/r/50609/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/335001ad
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/335001ad
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/335001ad
Branch: refs/heads/master
Commit: 335001ad26d7eb9f6cde6e2639296fa27cc959be
Parents: 0984bdf
Author: Greg Mann <gr...@mesosphere.io>
Authored: Thu Aug 4 09:27:07 2016 -0700
Committer: Vinod Kone <vi...@gmail.com>
Committed: Thu Aug 4 09:27:07 2016 -0700
----------------------------------------------------------------------
src/master/main.cpp | 12 ++++++------
src/slave/main.cpp | 10 +++++-----
2 files changed, 11 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/335001ad/src/master/main.cpp
----------------------------------------------------------------------
diff --git a/src/master/main.cpp b/src/master/main.cpp
index 0bce1df..4a1a8e7 100644
--- a/src/master/main.cpp
+++ b/src/master/main.cpp
@@ -202,9 +202,9 @@ int main(int argc, char** argv)
Try<flags::Warnings> load = flags.load("MESOS_", argc, argv);
- if (load.isError()) {
- cerr << flags.usage(load.error()) << endl;
- return EXIT_FAILURE;
+ if (flags.help) {
+ cout << flags.usage() << endl;
+ return EXIT_SUCCESS;
}
if (flags.version) {
@@ -212,9 +212,9 @@ int main(int argc, char** argv)
return EXIT_SUCCESS;
}
- if (flags.help) {
- cout << flags.usage() << endl;
- return EXIT_SUCCESS;
+ if (load.isError()) {
+ cerr << flags.usage(load.error()) << endl;
+ return EXIT_FAILURE;
}
if (ip_discovery_command.isSome() && ip.isSome()) {
http://git-wip-us.apache.org/repos/asf/mesos/blob/335001ad/src/slave/main.cpp
----------------------------------------------------------------------
diff --git a/src/slave/main.cpp b/src/slave/main.cpp
index c355a3c..8c9d241 100644
--- a/src/slave/main.cpp
+++ b/src/slave/main.cpp
@@ -187,6 +187,11 @@ int main(int argc, char** argv)
return EXIT_SUCCESS;
}
+ if (flags.version) {
+ cout << "mesos" << " " << MESOS_VERSION << endl;
+ return EXIT_SUCCESS;
+ }
+
// TODO(marco): this pattern too should be abstracted away
// in FlagsBase; I have seen it at least 15 times.
if (load.isError()) {
@@ -194,11 +199,6 @@ int main(int argc, char** argv)
return EXIT_FAILURE;
}
- if (flags.version) {
- cout << "mesos" << " " << MESOS_VERSION << endl;
- return EXIT_SUCCESS;
- }
-
if (master.isNone() && flags.master_detector.isNone()) {
cerr << flags.usage("Missing required option `--master` or "
"`--master_detector`.") << endl;