You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by al...@apache.org on 2017/09/18 21:22:19 UTC

[1/7] mesos git commit: Corrected double spaces around `<<`.

Repository: mesos
Updated Branches:
  refs/heads/master b214d7ae3 -> 10d130736


Corrected double spaces around `<<`.


Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/10d13073
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/10d13073
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/10d13073

Branch: refs/heads/master
Commit: 10d1307366543bf34b26f9193ac140a7b9f33aef
Parents: 865cf1d
Author: Alexander Rukletsov <al...@apache.org>
Authored: Mon Sep 18 23:20:15 2017 +0200
Committer: Alexander Rukletsov <al...@apache.org>
Committed: Mon Sep 18 23:21:47 2017 +0200

----------------------------------------------------------------------
 .../containerizer/mesos/isolators/docker/volume/isolator.cpp     | 2 +-
 src/slave/containerizer/mesos/isolators/network/port_mapping.cpp | 2 +-
 src/slave/slave.cpp                                              | 4 ++--
 src/slave/state.cpp                                              | 2 +-
 src/tests/containerizer/port_mapping_tests.cpp                   | 4 ++--
 5 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/10d13073/src/slave/containerizer/mesos/isolators/docker/volume/isolator.cpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/mesos/isolators/docker/volume/isolator.cpp b/src/slave/containerizer/mesos/isolators/docker/volume/isolator.cpp
index 5b630c1..ed65568 100644
--- a/src/slave/containerizer/mesos/isolators/docker/volume/isolator.cpp
+++ b/src/slave/containerizer/mesos/isolators/docker/volume/isolator.cpp
@@ -491,7 +491,7 @@ Future<Option<ContainerLaunchInfo>> DockerVolumeIsolatorProcess::_prepare(
     const string& target = targets[i];
 
     LOG(INFO) << "Mounting docker volume mount point '" << source
-              << "' to '" << target  << "' for container " << containerId;
+              << "' to '" << target << "' for container " << containerId;
 
     // Launch mount command as a non-shell subprocess to avoid
     // injecting arbitrary shell commands (e.g., user defined

http://git-wip-us.apache.org/repos/asf/mesos/blob/10d13073/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 60db6f8..7ee4dbe 100644
--- a/src/slave/containerizer/mesos/isolators/network/port_mapping.cpp
+++ b/src/slave/containerizer/mesos/isolators/network/port_mapping.cpp
@@ -3967,7 +3967,7 @@ string PortMappingIsolatorProcess::scripts(Info* info)
   // it.
   script << "ethtool -K " << eth0 << " rx off\n";
   script << "ip link set " << eth0 << " address " << hostMAC << " up\n";
-  script << "ip addr add " << hostIPNetwork  << " dev " << eth0 << "\n";
+  script << "ip addr add " << hostIPNetwork << " dev " << eth0 << "\n";
 
   // Set up the default gateway to match that of eth0.
   script << "ip route add default via " << hostDefaultGateway << "\n";

http://git-wip-us.apache.org/repos/asf/mesos/blob/10d13073/src/slave/slave.cpp
----------------------------------------------------------------------
diff --git a/src/slave/slave.cpp b/src/slave/slave.cpp
index 6d1516a..391a0d6 100644
--- a/src/slave/slave.cpp
+++ b/src/slave/slave.cpp
@@ -4506,8 +4506,8 @@ void Slave::statusUpdate(StatusUpdate update, const Option<UPID>& pid)
 
   Executor* executor = framework->getExecutor(status.task_id());
   if (executor == nullptr) {
-    LOG(WARNING)  << "Could not find the executor for "
-                  << "status update " << update;
+    LOG(WARNING) << "Could not find the executor for "
+                 << "status update " << update;
     metrics.valid_status_updates++;
 
     // NOTE: We forward the update here because this update could be

http://git-wip-us.apache.org/repos/asf/mesos/blob/10d13073/src/slave/state.cpp
----------------------------------------------------------------------
diff --git a/src/slave/state.cpp b/src/slave/state.cpp
index 24efd4b..d49c38e 100644
--- a/src/slave/state.cpp
+++ b/src/slave/state.cpp
@@ -557,7 +557,7 @@ Try<RunState> RunState::recover(
   // The marker could be absent if the slave died before the executor
   // registered with the slave.
   if (!os::exists(path)) {
-    LOG(WARNING) << "Failed to find '" <<  paths::LIBPROCESS_PID_FILE
+    LOG(WARNING) << "Failed to find '" << paths::LIBPROCESS_PID_FILE
                  << "' or '" << paths::HTTP_MARKER_FILE
                  << "' for container " << containerId
                  << " of executor '" << executorId

http://git-wip-us.apache.org/repos/asf/mesos/blob/10d13073/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 e9d90e7..56e193b 100644
--- a/src/tests/containerizer/port_mapping_tests.cpp
+++ b/src/tests/containerizer/port_mapping_tests.cpp
@@ -1552,7 +1552,7 @@ TEST_F(PortMappingIsolatorTest, ROOT_NC_SmallEgressLimit)
            << " bytes of data under egress rate limit " << rate.bytes()
            << "Bytes/s...';";
 
-  command2 << "{ time -p echo " << data  << " | nc localhost "
+  command2 << "{ time -p echo " << data << " | nc localhost "
            << invalidPort << " ; } 2> " << transmissionTime << " && ";
 
   // Touch the guard file.
@@ -1716,7 +1716,7 @@ TEST_F(PortMappingIsolatorTest, ROOT_NC_PortMappingStatistics)
            << " bytes of data under egress rate limit " << rate.bytes()
            << "Bytes/s...';";
 
-  command2 << "{ time -p echo " << data  << " | nc " << hostIP << " "
+  command2 << "{ time -p echo " << data << " | nc " << hostIP << " "
            << invalidPort << " ; } 2> " << transmissionTime << " && ";
 
   // Touch the guard file.


[6/7] mesos git commit: Libprocess: Corrected double spaces around `<<`.

Posted by al...@apache.org.
Libprocess: Corrected double spaces around `<<`.


Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/865cf1d8
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/865cf1d8
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/865cf1d8

Branch: refs/heads/master
Commit: 865cf1d8b6bd60150bd78d295fd3dd5b1464433a
Parents: dcfa2f9
Author: Alexander Rukletsov <al...@apache.org>
Authored: Mon Sep 18 23:20:05 2017 +0200
Committer: Alexander Rukletsov <al...@apache.org>
Committed: Mon Sep 18 23:21:47 2017 +0200

----------------------------------------------------------------------
 3rdparty/libprocess/src/openssl.cpp          | 2 +-
 3rdparty/libprocess/src/tests/benchmarks.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/865cf1d8/3rdparty/libprocess/src/openssl.cpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/src/openssl.cpp b/3rdparty/libprocess/src/openssl.cpp
index 22f073e..d16cc1d 100644
--- a/3rdparty/libprocess/src/openssl.cpp
+++ b/3rdparty/libprocess/src/openssl.cpp
@@ -542,7 +542,7 @@ void reinitialize()
         unsigned long error = ERR_get_error();
         EXIT(EXIT_FAILURE)
           << "Could not load CA file and/or directory (OpenSSL error #"
-          << stringify(error)  << "): "
+          << stringify(error) << "): "
           << error_string(error) << " -> "
           << (ca_file != nullptr ? (stringify("FILE: ") + ca_file) : "")
           << (ca_dir != nullptr ? (stringify("DIR: ") + ca_dir) : "");

http://git-wip-us.apache.org/repos/asf/mesos/blob/865cf1d8/3rdparty/libprocess/src/tests/benchmarks.cpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/src/tests/benchmarks.cpp b/3rdparty/libprocess/src/tests/benchmarks.cpp
index a691705..8195193 100644
--- a/3rdparty/libprocess/src/tests/benchmarks.cpp
+++ b/3rdparty/libprocess/src/tests/benchmarks.cpp
@@ -543,7 +543,7 @@ public:
 
     AWAIT_READY(promise.future());
 
-    cout << name <<  " elapsed: " << watch.elapsed() << endl;
+    cout << name << " elapsed: " << watch.elapsed() << endl;
 
     terminate(process.get());
     wait(process.get());


[7/7] mesos git commit: Added `logging::initialize()` to main functions that use glog.

Posted by al...@apache.org.
Added `logging::initialize()` to main functions that use glog.

This change reduces the number of messages "WARNING: Logging
before InitGoogleLogging() is written to STDERR".

Review: https://reviews.apache.org/r/62037/


Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/387ec70e
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/387ec70e
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/387ec70e

Branch: refs/heads/master
Commit: 387ec70e2514a4b9eb55593d04046a034c532dc2
Parents: a16e1d6
Author: Armand Grillet <ag...@mesosphere.io>
Authored: Mon Sep 18 20:51:39 2017 +0200
Committer: Alexander Rukletsov <al...@apache.org>
Committed: Mon Sep 18 23:21:47 2017 +0200

----------------------------------------------------------------------
 src/checks/tcp_connect.cpp                      | 27 +++---
 src/cli/execute.cpp                             | 98 +++++++++-----------
 src/cli/resolve.cpp                             | 12 +--
 src/examples/balloon_framework.cpp              | 24 +++--
 src/examples/disk_full_framework.cpp            | 19 +++-
 src/examples/dynamic_reservation_framework.cpp  | 34 +++++--
 src/examples/long_lived_framework.cpp           | 13 ++-
 src/examples/no_executor_framework.cpp          | 38 +++++---
 src/examples/test_framework.cpp                 | 19 ++--
 src/examples/test_http_framework.cpp            | 22 +++--
 src/launcher/fetcher.cpp                        | 10 +-
 src/slave/container_loggers/logrotate.cpp       | 12 ++-
 .../containerizer/mesos/io/switchboard_main.cpp | 13 ++-
 src/tests/main.cpp                              | 46 ++++-----
 src/usage/main.cpp                              |  2 +-
 15 files changed, 240 insertions(+), 149 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/387ec70e/src/checks/tcp_connect.cpp
----------------------------------------------------------------------
diff --git a/src/checks/tcp_connect.cpp b/src/checks/tcp_connect.cpp
index 3cb9077..2514f4a 100644
--- a/src/checks/tcp_connect.cpp
+++ b/src/checks/tcp_connect.cpp
@@ -116,30 +116,25 @@ int testTCPConnect(const string& ip, int port)
 
 int main(int argc, char *argv[])
 {
-#ifdef __WINDOWS__
-  if (!net::wsa_initialize()) {
-    EXIT(EXIT_FAILURE) << "WSA failed to initialize";
-  }
-#endif // __WINDOWS__
-
   Flags flags;
 
   Try<flags::Warnings> load = flags.load(None(), argc, argv);
 
+  if (flags.help) {
+    cout << flags.usage() << endl;
+    return EXIT_SUCCESS;
+  }
+
   if (load.isError()) {
     cerr << flags.usage(load.error()) << endl;
     return EXIT_FAILURE;
   }
 
+  // Log any flag warnings.
   foreach (const flags::Warning& warning, load->warnings) {
     cerr << warning.message << endl;
   }
 
-  if (flags.help) {
-    cout << flags.usage() << endl;
-    return EXIT_SUCCESS;
-  }
-
   if (flags.ip.isNone()) {
     cerr << flags.usage("Missing required option --ip") << endl;
     return EXIT_FAILURE;
@@ -150,11 +145,19 @@ int main(int argc, char *argv[])
     return EXIT_FAILURE;
   }
 
+#ifdef __WINDOWS__
+  if (!net::wsa_initialize()) {
+    cerr << "WSA failed to initialize" << endl;
+    return EXIT_FAILURE;
+  }
+#endif // __WINDOWS__
+
   int result = testTCPConnect(flags.ip.get(), flags.port.get());
 
 #ifdef __WINDOWS__
   if (!net::wsa_cleanup()) {
-    EXIT(EXIT_FAILURE) << "Failed to finalize the WSA socket stack";
+    cerr << "Failed to finalize the WSA socket stack" << endl;
+    return EXIT_FAILURE;
   }
 #endif // __WINDOWS__
 

http://git-wip-us.apache.org/repos/asf/mesos/blob/387ec70e/src/cli/execute.cpp
----------------------------------------------------------------------
diff --git a/src/cli/execute.cpp b/src/cli/execute.cpp
index e844fa4..78b62a6 100644
--- a/src/cli/execute.cpp
+++ b/src/cli/execute.cpp
@@ -46,6 +46,8 @@
 
 #include "internal/devolve.hpp"
 
+#include "logging/logging.hpp"
+
 #include "v1/parse.hpp"
 
 using std::cerr;
@@ -900,11 +902,6 @@ int main(int argc, char** argv)
   // Load flags from command line only.
   Try<flags::Warnings> load = flags.load(None(), argc, argv);
 
-  if (load.isError()) {
-    cerr << flags.usage(load.error()) << endl;
-    return EXIT_FAILURE;
-  }
-
   // TODO(marco): this should be encapsulated entirely into the
   // FlagsBase API - possibly with a 'guard' that prevents FlagsBase
   // from calling ::exit(EXIT_FAILURE) after calling usage() (which
@@ -914,25 +911,29 @@ int main(int argc, char** argv)
     return EXIT_SUCCESS;
   }
 
+  if (load.isError()) {
+    cerr << flags.usage(load.error()) << endl;
+    return EXIT_FAILURE;
+  }
+
+  mesos::internal::logging::initialize(argv[0], false);
+
   // Log any flag warnings.
   foreach (const flags::Warning& warning, load->warnings) {
     LOG(WARNING) << warning.message;
   }
 
   if (flags.task.isSome() && flags.task_group.isSome()) {
-    cerr << flags.usage(
-              "Either task or task group should be set but not both. Provide"
-              " either '--task' OR '--task_group'") << endl;
-    return EXIT_FAILURE;
+    EXIT(EXIT_FAILURE) << flags.usage(
+        "Either task or task group should be set but not both."
+        " Provide either '--task' OR '--task_group'");
   } else if (flags.task.isNone() && flags.task_group.isNone()) {
     if (flags.name.isNone()) {
-      cerr << flags.usage("Missing required option --name") << endl;
-      return EXIT_FAILURE;
+      EXIT(EXIT_FAILURE) << flags.usage("Missing required option --name");
     }
 
     if (flags.shell && flags.command.isNone()) {
-      cerr << flags.usage("Missing required option --command") << endl;
-      return EXIT_FAILURE;
+      EXIT(EXIT_FAILURE) << flags.usage("Missing required option --command");
     }
   } else {
     // Either --task or --task_group is set.
@@ -942,18 +943,16 @@ int main(int argc, char** argv)
         flags.appc_image.isSome()  ||
         flags.docker_image.isSome() ||
         flags.volumes.isSome()) {
-      cerr << flags.usage(
-                "'--name, --command, --env, --appc_image, --docker_image,"
-                " --volumes' can only be set when both '--task' and"
-                " '--task_group' are not set") << endl;
-      return EXIT_FAILURE;
+      EXIT(EXIT_FAILURE) << flags.usage(
+          "'--name, --command, --env, --appc_image, --docker_image,"
+          " --volumes' can only be set when both '--task'"
+          " and '--task_group' are not set");
     }
 
     if (flags.task.isSome() && flags.networks.isSome()) {
-      cerr << flags.usage(
-                "'--networks' can only be set when"
-                " '--task' is not set") << endl;
-      return EXIT_FAILURE;
+      EXIT(EXIT_FAILURE) << flags.usage(
+          "'--networks' can only be set when"
+          " '--task' is not set");
     }
   }
 
@@ -964,18 +963,16 @@ int main(int argc, char** argv)
              flags.content_type == mesos::APPLICATION_PROTOBUF) {
     contentType = mesos::ContentType::PROTOBUF;
   } else {
-    cerr << "Invalid content type '" << flags.content_type << "'" << endl;
-    return EXIT_FAILURE;
+    EXIT(EXIT_FAILURE) << "Invalid content type '" << flags.content_type << "'";
   }
 
   Result<string> user = os::user();
   if (!user.isSome()) {
     if (user.isError()) {
-      cerr << "Failed to get username: " << user.error() << endl;
+      EXIT(EXIT_FAILURE) << "Failed to get username: " << user.error();
     } else {
-      cerr << "No username for uid " << ::getuid() << endl;
+      EXIT(EXIT_FAILURE) << "No username for uid " << ::getuid();
     }
-    return EXIT_FAILURE;
   }
 
   Option<hashmap<string, string>> environment = None();
@@ -991,8 +988,7 @@ int main(int argc, char** argv)
   if (flags.package.isSome()) {
     Try<Owned<HDFS>> hdfs = HDFS::create(flags.hadoop);
     if (hdfs.isError()) {
-      cerr << "Failed to create HDFS client: " << hdfs.error() << endl;
-      return EXIT_FAILURE;
+      EXIT(EXIT_FAILURE) << "Failed to create HDFS client: " << hdfs.error();
     }
 
     // TODO(benh): If HDFS is not properly configured with
@@ -1010,30 +1006,29 @@ int main(int argc, char** argv)
     exists.await();
 
     if (!exists.isReady()) {
-      cerr << "Failed to check if file exists: "
-           << (exists.isFailed() ? exists.failure() : "discarded") << endl;
-      return EXIT_FAILURE;
+      EXIT(EXIT_FAILURE)
+        << "Failed to check if file exists: "
+        << (exists.isFailed() ? exists.failure() : "discarded");
     } else if (exists.get() && flags.overwrite) {
       Future<Nothing> rm = hdfs.get()->rm(path);
       rm.await();
 
       if (!rm.isReady()) {
-        cerr << "Failed to remove existing file: "
-             << (rm.isFailed() ? rm.failure() : "discarded") << endl;
-        return EXIT_FAILURE;
+        EXIT(EXIT_FAILURE)
+          << "Failed to remove existing file: "
+          << (rm.isFailed() ? rm.failure() : "discarded");
       }
     } else if (exists.get()) {
-      cerr << "File already exists (see --overwrite)" << endl;
-      return EXIT_FAILURE;
+      EXIT(EXIT_FAILURE) << "File already exists (see --overwrite)";
     }
 
     Future<Nothing> copy = hdfs.get()->copyFromLocal(flags.package.get(), path);
     copy.await();
 
     if (!copy.isReady()) {
-      cerr << "Failed to copy package: "
-           << (copy.isFailed() ? copy.failure() : "discarded") << endl;
-      return EXIT_FAILURE;
+      EXIT(EXIT_FAILURE)
+        << "Failed to copy package: "
+        << (copy.isFailed() ? copy.failure() : "discarded");
     }
 
     // Now save the URI.
@@ -1051,8 +1046,8 @@ int main(int argc, char** argv)
   }
 
   if (appcImage.isSome() && dockerImage.isSome()) {
-    cerr << "Flags '--docker-image' and '--appc-image' are both set" << endl;
-    return EXIT_FAILURE;
+    EXIT(EXIT_FAILURE)
+      << "Flags '--docker-image' and '--appc-image' are both set";
   }
 
   // Always enable the RESERVATION_REFINEMENT and TASK_KILLING_STATE
@@ -1073,17 +1068,15 @@ int main(int argc, char** argv)
       FrameworkInfo::Capability::Type type;
 
       if (!FrameworkInfo::Capability::Type_Parse(capability, &type)) {
-        cerr << "Flags '--framework_capabilities'"
-                " specifies an unknown capability"
-                " '" << capability << "'" << endl;
-        return EXIT_FAILURE;
+        EXIT(EXIT_FAILURE)
+          << "Flags '--framework_capabilities' specifies an unknown"
+          << " capability '" << capability << "'";
       }
 
       if (type != FrameworkInfo::Capability::GPU_RESOURCES) {
-        cerr << "Flags '--framework_capabilities'"
-                " specifies an unsupported capability"
-                " '" << capability << "'" << endl;
-        return EXIT_FAILURE;
+        EXIT(EXIT_FAILURE)
+          << "Flags '--framework_capabilities' specifies an unsupported"
+          << " capability '" << capability << "'";
       }
 
       frameworkCapabilities.push_back(type);
@@ -1097,9 +1090,8 @@ int main(int argc, char** argv)
       ::protobuf::parse<RepeatedPtrField<Volume>>(flags.volumes.get());
 
     if (parse.isError()) {
-      cerr << "Failed to convert '--volumes' to protobuf: "
-           << parse.error() << endl;
-      return EXIT_FAILURE;
+      EXIT(EXIT_FAILURE)
+        << "Failed to convert '--volumes' to protobuf: " << parse.error();
     }
 
     vector<Volume> _volumes;

http://git-wip-us.apache.org/repos/asf/mesos/blob/387ec70e/src/cli/resolve.cpp
----------------------------------------------------------------------
diff --git a/src/cli/resolve.cpp b/src/cli/resolve.cpp
index b3cba87..fe62f9f 100644
--- a/src/cli/resolve.cpp
+++ b/src/cli/resolve.cpp
@@ -70,19 +70,19 @@ int main(int argc, char** argv)
   // them from argv.
   Try<flags::Warnings> load = flags.load(None(), &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 (load.isError()) {
+    cerr << flags.usage(load.error()) << endl;
+    return EXIT_FAILURE;
+  }
+
   // Log any flag warnings.
   foreach (const flags::Warning& warning, load->warnings) {
-    LOG(WARNING) << warning.message;
+    cerr << warning.message << endl;
   }
 
   // 'master' argument must be the only argument left after parsing.

http://git-wip-us.apache.org/repos/asf/mesos/blob/387ec70e/src/examples/balloon_framework.cpp
----------------------------------------------------------------------
diff --git a/src/examples/balloon_framework.cpp b/src/examples/balloon_framework.cpp
index a63dbab..0136344 100644
--- a/src/examples/balloon_framework.cpp
+++ b/src/examples/balloon_framework.cpp
@@ -14,8 +14,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <glog/logging.h>
-
 #include <iostream>
 #include <string>
 #include <vector>
@@ -45,6 +43,8 @@
 
 #include "common/parse.hpp"
 
+#include "logging/logging.hpp"
+
 using namespace mesos;
 using namespace mesos::internal;
 
@@ -488,8 +488,21 @@ int main(int argc, char** argv)
   Flags flags;
   Try<flags::Warnings> load = flags.load("MESOS_", argc, argv);
 
+  if (flags.help) {
+    std::cout << flags.usage() << std::endl;
+    return EXIT_SUCCESS;
+  }
+
   if (load.isError()) {
-    EXIT(EXIT_FAILURE) << flags.usage(load.error());
+    std::cerr << flags.usage(load.error()) << std::endl;
+    return EXIT_FAILURE;
+  }
+
+  logging::initialize(argv[0], false);
+
+  // Log any flag warnings.
+  foreach (const flags::Warning& warning, load->warnings) {
+    LOG(WARNING) << warning.message;
   }
 
   const Resources resources = Resources::parse(
@@ -559,11 +572,6 @@ int main(int argc, char** argv)
 
   BalloonScheduler scheduler(framework, executor, flags);
 
-  // Log any flag warnings (after logging is initialized by the scheduler).
-  foreach (const flags::Warning& warning, load->warnings) {
-    LOG(WARNING) << warning.message;
-  }
-
   MesosSchedulerDriver* driver;
 
   // TODO(josephw): Refactor these into a common set of flags.

http://git-wip-us.apache.org/repos/asf/mesos/blob/387ec70e/src/examples/disk_full_framework.cpp
----------------------------------------------------------------------
diff --git a/src/examples/disk_full_framework.cpp b/src/examples/disk_full_framework.cpp
index 2572c72..28f71c3 100644
--- a/src/examples/disk_full_framework.cpp
+++ b/src/examples/disk_full_framework.cpp
@@ -14,8 +14,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <glog/logging.h>
-
 #include <string>
 #include <vector>
 
@@ -40,6 +38,8 @@
 #include <stout/os.hpp>
 #include <stout/try.hpp>
 
+#include "logging/logging.hpp"
+
 using namespace mesos;
 
 using std::string;
@@ -444,8 +444,21 @@ int main(int argc, char** argv)
   Flags flags;
   Try<flags::Warnings> load = flags.load("MESOS_", argc, argv);
 
+  if (flags.help) {
+    std::cout << flags.usage() << std::endl;
+    return EXIT_SUCCESS;
+  }
+
   if (load.isError()) {
-    EXIT(EXIT_FAILURE) << flags.usage(load.error());
+    std::cerr << flags.usage(load.error()) << std::endl;
+    return EXIT_FAILURE;
+  }
+
+  internal::logging::initialize(argv[0], false);
+
+  // Log any flag warnings.
+  foreach (const flags::Warning& warning, load->warnings) {
+    LOG(WARNING) << warning.message;
   }
 
   FrameworkInfo framework;

http://git-wip-us.apache.org/repos/asf/mesos/blob/387ec70e/src/examples/dynamic_reservation_framework.cpp
----------------------------------------------------------------------
diff --git a/src/examples/dynamic_reservation_framework.cpp b/src/examples/dynamic_reservation_framework.cpp
index bb6f58b..5935f2c 100644
--- a/src/examples/dynamic_reservation_framework.cpp
+++ b/src/examples/dynamic_reservation_framework.cpp
@@ -17,8 +17,6 @@
 #include <string>
 #include <vector>
 
-#include <glog/logging.h>
-
 #include <mesos/resources.hpp>
 #include <mesos/scheduler.hpp>
 #include <mesos/type_utils.hpp>
@@ -34,8 +32,13 @@
 #include <stout/stringify.hpp>
 #include <stout/try.hpp>
 
+#include "logging/logging.hpp"
+
 using namespace mesos;
 
+using std::cerr;
+using std::cout;
+using std::endl;
 using std::string;
 using std::vector;
 
@@ -363,17 +366,32 @@ int main(int argc, char** argv)
   Flags flags;
 
   Try<flags::Warnings> load = flags.load(None(), argc, argv);
+
+  if (flags.help) {
+    cout << flags.usage() << endl;
+    return EXIT_SUCCESS;
+  }
+
   if (load.isError()) {
-    EXIT(EXIT_FAILURE) << flags.usage(load.error());
-  } else if (flags.master.isNone()) {
-    EXIT(EXIT_FAILURE) << flags.usage("Missing --master");
+    cerr << flags.usage(load.error()) << endl;
+    return EXIT_FAILURE;
+  }
+
+  if (flags.master.isNone()) {
+    cerr << flags.usage("Missing --master") << endl;
+    return EXIT_FAILURE;
   } else if (flags.role.isNone()) {
-    EXIT(EXIT_FAILURE) << flags.usage("Missing --role");
+    cerr << flags.usage("Missing --role") << endl;
+    return EXIT_FAILURE;
   } else if (flags.role.get() == "*") {
-    EXIT(EXIT_FAILURE)
-      << flags.usage("Role is incorrect; the default '*' role cannot be used");
+    cerr << flags.usage(
+                "Role is incorrect; the default '*' role cannot be used")
+         << endl;
+    return EXIT_FAILURE;
   }
 
+  internal::logging::initialize(argv[0], false);
+
   // Log any flag warnings.
   foreach (const flags::Warning& warning, load->warnings) {
     LOG(WARNING) << warning.message;

http://git-wip-us.apache.org/repos/asf/mesos/blob/387ec70e/src/examples/long_lived_framework.cpp
----------------------------------------------------------------------
diff --git a/src/examples/long_lived_framework.cpp b/src/examples/long_lived_framework.cpp
index da63204..4304972 100644
--- a/src/examples/long_lived_framework.cpp
+++ b/src/examples/long_lived_framework.cpp
@@ -47,6 +47,8 @@
 
 #include "common/parse.hpp"
 
+#include "logging/logging.hpp"
+
 using std::queue;
 using std::string;
 using std::vector;
@@ -573,12 +575,21 @@ public:
 int main(int argc, char** argv)
 {
   Flags flags;
+
   Try<flags::Warnings> load = flags.load("MESOS_", argc, argv);
 
+  if (flags.help) {
+    std::cout << flags.usage() << std::endl;
+    return EXIT_SUCCESS;
+  }
+
   if (load.isError()) {
-    EXIT(EXIT_FAILURE) << flags.usage(load.error());
+    std::cerr << flags.usage(load.error()) << std::endl;
+    return EXIT_FAILURE;
   }
 
+  mesos::internal::logging::initialize(argv[0], false);
+
   // Log any flag warnings.
   foreach (const flags::Warning& warning, load->warnings) {
     LOG(WARNING) << warning.message;

http://git-wip-us.apache.org/repos/asf/mesos/blob/387ec70e/src/examples/no_executor_framework.cpp
----------------------------------------------------------------------
diff --git a/src/examples/no_executor_framework.cpp b/src/examples/no_executor_framework.cpp
index 84fbf92..3aa401b 100644
--- a/src/examples/no_executor_framework.cpp
+++ b/src/examples/no_executor_framework.cpp
@@ -38,6 +38,9 @@
 using namespace mesos;
 using namespace mesos::internal;
 
+using std::cerr;
+using std::cout;
+using std::endl;
 using std::string;
 using std::vector;
 
@@ -292,27 +295,34 @@ int main(int argc, char** argv)
 
   Try<flags::Warnings> load = flags.load("MESOS_", argc, argv);
 
-  if (load.isError()) {
-    EXIT(EXIT_FAILURE) << flags.usage(load.error());
-  }
-
-  // Log any flag warnings.
-  foreach (const flags::Warning& warning, load->warnings) {
-    LOG(WARNING) << warning.message;
+  if (flags.help) {
+    cout << flags.usage() << endl;
+    return EXIT_SUCCESS;
   }
 
-  if (flags.help) {
-    EXIT(EXIT_SUCCESS) << flags.usage();
+  if (load.isError()) {
+    cerr << flags.usage(load.error()) << endl;
+    return EXIT_FAILURE;
   }
 
   if (flags.master.isNone()) {
-    EXIT(EXIT_FAILURE) << flags.usage("Missing required option --master");
+    cerr << flags.usage("Missing required option --master") << endl;
+    return EXIT_FAILURE;
   }
 
   if (flags.principal.isSome() != flags.secret.isSome()) {
-    EXIT(EXIT_FAILURE) << flags.usage(
-        "Both --principal and --secret are required"
-        " to enable authentication");
+    cerr << flags.usage(
+                "Both --principal and --secret are required"
+                " to enable authentication")
+         << endl;
+    return EXIT_FAILURE;
+  }
+
+  logging::initialize(argv[0], true, flags); // Catch signals.
+
+  // Log any flag warnings.
+  foreach (const flags::Warning& warning, load->warnings) {
+    LOG(WARNING) << warning.message;
   }
 
   FrameworkInfo framework;
@@ -357,8 +367,6 @@ int main(int argc, char** argv)
 
   taskResources.allocate(framework.role());
 
-  logging::initialize(argv[0], true, flags); // Catch signals.
-
   NoExecutorScheduler scheduler(
       framework,
       flags.command,

http://git-wip-us.apache.org/repos/asf/mesos/blob/387ec70e/src/examples/test_framework.cpp
----------------------------------------------------------------------
diff --git a/src/examples/test_framework.cpp b/src/examples/test_framework.cpp
index 8356d22..c6a293e 100644
--- a/src/examples/test_framework.cpp
+++ b/src/examples/test_framework.cpp
@@ -239,14 +239,19 @@ int main(int argc, char** argv)
 
   Try<flags::Warnings> load = flags.load(None(), argc, argv);
 
+  if (flags.help) {
+    cout << flags.usage() << endl;
+    return EXIT_SUCCESS;
+  }
+
   if (load.isError()) {
-    cerr << load.error() << endl;
-    usage(argv[0], flags);
-    exit(EXIT_FAILURE);
-  } else if (flags.master.isNone()) {
-    cerr << "Missing --master" << endl;
-    usage(argv[0], flags);
-    exit(EXIT_FAILURE);
+    cerr << flags.usage(load.error()) << endl;
+    return EXIT_FAILURE;
+  }
+
+  if (flags.master.isNone()) {
+    cerr << flags.usage("Missing --master") << endl;
+    return EXIT_FAILURE;
   }
 
   internal::logging::initialize(argv[0], true, flags); // Catch signals.

http://git-wip-us.apache.org/repos/asf/mesos/blob/387ec70e/src/examples/test_http_framework.cpp
----------------------------------------------------------------------
diff --git a/src/examples/test_http_framework.cpp b/src/examples/test_http_framework.cpp
index 5665b4d..e640800 100644
--- a/src/examples/test_http_framework.cpp
+++ b/src/examples/test_http_framework.cpp
@@ -417,20 +417,24 @@ int main(int argc, char** argv)
 
   Try<flags::Warnings> load = flags.load(None(), argc, argv);
 
+  if (flags.help) {
+    cout << flags.usage() << endl;
+    return EXIT_SUCCESS;
+  }
+
   if (load.isError()) {
-    cerr << load.error() << endl;
-    usage(argv[0], flags);
-    EXIT(EXIT_FAILURE);
-  } else if (flags.master.isNone()) {
-    cerr << "Missing --master" << endl;
-    usage(argv[0], flags);
-    EXIT(EXIT_FAILURE);
+    cerr << flags.usage(load.error()) << endl;
+    return EXIT_FAILURE;
+  }
+
+  if (flags.master.isNone()) {
+    cerr << flags.usage("Missing --master") << endl;
+    return EXIT_FAILURE;
   }
 
-  process::initialize();
   mesos::internal::logging::initialize(argv[0], true, flags); // Catch signals.
 
-  // Log any flag warnings (after logging is initialized).
+  // Log any flag warnings.
   foreach (const flags::Warning& warning, load->warnings) {
     LOG(WARNING) << warning.message;
   }

http://git-wip-us.apache.org/repos/asf/mesos/blob/387ec70e/src/launcher/fetcher.cpp
----------------------------------------------------------------------
diff --git a/src/launcher/fetcher.cpp b/src/launcher/fetcher.cpp
index ff24ecb..27b2913 100644
--- a/src/launcher/fetcher.cpp
+++ b/src/launcher/fetcher.cpp
@@ -517,7 +517,15 @@ int main(int argc, char* argv[])
 
   Try<flags::Warnings> load = flags.load("MESOS_", argc, argv);
 
-  CHECK_SOME(load) << "Could not load flags: " << load.error();
+  if (flags.help) {
+    std::cout << flags.usage() << std::endl;
+    return EXIT_SUCCESS;
+  }
+
+  if (load.isError()) {
+    std::cerr << flags.usage(load.error()) << std::endl;
+    return EXIT_FAILURE;
+  }
 
   logging::initialize(argv[0], true, flags); // Catch signals.
 

http://git-wip-us.apache.org/repos/asf/mesos/blob/387ec70e/src/slave/container_loggers/logrotate.cpp
----------------------------------------------------------------------
diff --git a/src/slave/container_loggers/logrotate.cpp b/src/slave/container_loggers/logrotate.cpp
index 61484b1..bd41912 100644
--- a/src/slave/container_loggers/logrotate.cpp
+++ b/src/slave/container_loggers/logrotate.cpp
@@ -40,6 +40,8 @@
 #include <stout/os/su.hpp>
 #include <stout/os/write.hpp>
 
+#include "logging/logging.hpp"
+
 #include "slave/container_loggers/logrotate.hpp"
 
 
@@ -226,10 +228,18 @@ int main(int argc, char** argv)
   // Load and validate flags from the environment and command line.
   Try<flags::Warnings> load = flags.load(None(), &argc, &argv);
 
+  if (flags.help) {
+    std::cout << flags.usage() << std::endl;
+    return EXIT_SUCCESS;
+  }
+
   if (load.isError()) {
-    EXIT(EXIT_FAILURE) << flags.usage(load.error());
+    std::cerr << flags.usage(load.error()) << std::endl;
+    return EXIT_FAILURE;
   }
 
+  mesos::internal::logging::initialize(argv[0], false);
+
   // Log any flag warnings.
   foreach (const flags::Warning& warning, load->warnings) {
     LOG(WARNING) << warning.message;

http://git-wip-us.apache.org/repos/asf/mesos/blob/387ec70e/src/slave/containerizer/mesos/io/switchboard_main.cpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/mesos/io/switchboard_main.cpp b/src/slave/containerizer/mesos/io/switchboard_main.cpp
index fa0b296..0ff58e1 100644
--- a/src/slave/containerizer/mesos/io/switchboard_main.cpp
+++ b/src/slave/containerizer/mesos/io/switchboard_main.cpp
@@ -24,6 +24,8 @@
 #include <stout/os.hpp>
 #include <stout/try.hpp>
 
+#include "logging/logging.hpp"
+
 #include "slave/containerizer/mesos/io/switchboard.hpp"
 
 namespace io = process::io;
@@ -63,10 +65,19 @@ int main(int argc, char** argv)
 
   // Load and validate flags from the environment and command line.
   Try<flags::Warnings> load = flags.load(None(), &argc, &argv);
+
+  if (flags.help) {
+    std::cout << flags.usage() << std::endl;
+    return EXIT_SUCCESS;
+  }
+
   if (load.isError()) {
-    EXIT(EXIT_FAILURE) << flags.usage(load.error());
+    std::cerr << flags.usage(load.error()) << std::endl;
+    return EXIT_FAILURE;
   }
 
+  mesos::internal::logging::initialize(argv[0], false);
+
   // Verify non-optional flags have valid values.
   if (flags.stdin_to_fd.isNone()) {
     EXIT(EXIT_FAILURE) << flags.usage("'--stdin_to_fd' is missing");

http://git-wip-us.apache.org/repos/asf/mesos/blob/387ec70e/src/tests/main.cpp
----------------------------------------------------------------------
diff --git a/src/tests/main.cpp b/src/tests/main.cpp
index 6911b64..cd30cac 100644
--- a/src/tests/main.cpp
+++ b/src/tests/main.cpp
@@ -67,7 +67,8 @@ int main(int argc, char** argv)
 {
 #ifdef __WINDOWS__
   if (!net::wsa_initialize()) {
-    EXIT(EXIT_FAILURE) << "WSA failed to initialize";
+    cerr << "WSA failed to initialize" << endl;
+    return EXIT_FAILURE;
   }
 
   // When we're running a debug build, the Windows implementation of the C
@@ -81,21 +82,34 @@ int main(int argc, char** argv)
 
   GOOGLE_PROTOBUF_VERIFY_VERSION;
 
-  using mesos::internal::tests::flags; // Needed to disabmiguate.
+  using mesos::internal::tests::flags; // Needed to disambiguate.
 
   // Load flags from environment and command line but allow unknown
   // flags (since we might have gtest/gmock flags as well).
   Try<flags::Warnings> load = flags.load("MESOS_", argc, argv, true);
 
+  if (flags.help) {
+    cout << flags.usage() << endl;
+    testing::InitGoogleTest(&argc, argv); // Get usage from gtest too.
+    return EXIT_SUCCESS;
+  }
+
   if (load.isError()) {
     cerr << flags.usage(load.error()) << endl;
     return EXIT_FAILURE;
   }
 
-  if (flags.help) {
-    cout << flags.usage() << endl;
-    testing::InitGoogleTest(&argc, argv); // Get usage from gtest too.
-    return EXIT_SUCCESS;
+  // Be quiet by default!
+  if (!flags.verbose) {
+    flags.quiet = true;
+  }
+
+  // Initialize logging.
+  logging::initialize(argv[0], true, flags);
+
+  // Log any flag warnings (after logging is initialized).
+  foreach (const flags::Warning& warning, load->warnings) {
+    LOG(WARNING) << warning.message;
   }
 
 // TODO(josephw): Modules are not supported on Windows (MESOS-5994).
@@ -116,8 +130,7 @@ int main(int argc, char** argv)
 
   Try<Nothing> result = tests::initModules(flags.modules);
   if (result.isError()) {
-    cerr << "Error initializing modules: " << result.error() << endl;
-    return EXIT_FAILURE;
+    EXIT(EXIT_FAILURE) << "Error initializing modules: " << result.error();
   }
 #endif // __WINDOWS__
 
@@ -136,25 +149,12 @@ int main(int argc, char** argv)
                        << "`main()` was not the function's first invocation";
   }
 
-  // Be quiet by default!
-  if (!flags.verbose) {
-    flags.quiet = true;
-  }
-
-  // Initialize logging.
-  logging::initialize(argv[0], true, flags);
-
-  // Log any flag warnings (after logging is initialized).
-  foreach (const flags::Warning& warning, load->warnings) {
-    LOG(WARNING) << warning.message;
-  }
-
   // Initialize gmock/gtest.
   testing::InitGoogleTest(&argc, argv);
   testing::FLAGS_gtest_death_test_style = "threadsafe";
 
-  cout << "Source directory: " << flags.source_dir << endl;
-  cout << "Build directory: " << flags.build_dir << endl;
+  LOG(INFO) << "Source directory: " << flags.source_dir;
+  LOG(INFO) << "Build directory: " << flags.build_dir;
 
   // Instantiate our environment. Note that it will be managed by
   // gtest after we add it via testing::AddGlobalTestEnvironment.

http://git-wip-us.apache.org/repos/asf/mesos/blob/387ec70e/src/usage/main.cpp
----------------------------------------------------------------------
diff --git a/src/usage/main.cpp b/src/usage/main.cpp
index 5ad4a3b..64139f4 100644
--- a/src/usage/main.cpp
+++ b/src/usage/main.cpp
@@ -80,7 +80,7 @@ int main(int argc, char** argv)
 
   // Log any flag warnings.
   foreach (const flags::Warning& warning, load->warnings) {
-    LOG(WARNING) << warning.message;
+    cerr << warning.message << endl;
   }
 
   if (flags.pid.isNone()) {


[2/7] mesos git commit: Removed extra new lines in example frameworks.

Posted by al...@apache.org.
Removed extra new lines in example frameworks.


Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/dcfa2f90
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/dcfa2f90
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/dcfa2f90

Branch: refs/heads/master
Commit: dcfa2f905569121290af048df6b3801804235db3
Parents: 387ec70
Author: Alexander Rukletsov <al...@apache.org>
Authored: Mon Sep 18 22:58:50 2017 +0200
Committer: Alexander Rukletsov <al...@apache.org>
Committed: Mon Sep 18 23:21:47 2017 +0200

----------------------------------------------------------------------
 src/examples/dynamic_reservation_framework.cpp |  1 -
 src/examples/load_generator_framework.cpp      |  1 -
 src/examples/long_lived_framework.cpp          |  1 -
 src/examples/no_executor_framework.cpp         |  1 -
 src/examples/persistent_volume_framework.cpp   | 11 +++++------
 5 files changed, 5 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/dcfa2f90/src/examples/dynamic_reservation_framework.cpp
----------------------------------------------------------------------
diff --git a/src/examples/dynamic_reservation_framework.cpp b/src/examples/dynamic_reservation_framework.cpp
index 5935f2c..5ee3867 100644
--- a/src/examples/dynamic_reservation_framework.cpp
+++ b/src/examples/dynamic_reservation_framework.cpp
@@ -364,7 +364,6 @@ public:
 int main(int argc, char** argv)
 {
   Flags flags;
-
   Try<flags::Warnings> load = flags.load(None(), argc, argv);
 
   if (flags.help) {

http://git-wip-us.apache.org/repos/asf/mesos/blob/dcfa2f90/src/examples/load_generator_framework.cpp
----------------------------------------------------------------------
diff --git a/src/examples/load_generator_framework.cpp b/src/examples/load_generator_framework.cpp
index 63c88b4..4286799 100644
--- a/src/examples/load_generator_framework.cpp
+++ b/src/examples/load_generator_framework.cpp
@@ -285,7 +285,6 @@ public:
 int main(int argc, char** argv)
 {
   Flags flags;
-
   Try<flags::Warnings> load = flags.load("MESOS_", argc, argv);
 
   if (load.isError()) {

http://git-wip-us.apache.org/repos/asf/mesos/blob/dcfa2f90/src/examples/long_lived_framework.cpp
----------------------------------------------------------------------
diff --git a/src/examples/long_lived_framework.cpp b/src/examples/long_lived_framework.cpp
index 4304972..adfe10e 100644
--- a/src/examples/long_lived_framework.cpp
+++ b/src/examples/long_lived_framework.cpp
@@ -575,7 +575,6 @@ public:
 int main(int argc, char** argv)
 {
   Flags flags;
-
   Try<flags::Warnings> load = flags.load("MESOS_", argc, argv);
 
   if (flags.help) {

http://git-wip-us.apache.org/repos/asf/mesos/blob/dcfa2f90/src/examples/no_executor_framework.cpp
----------------------------------------------------------------------
diff --git a/src/examples/no_executor_framework.cpp b/src/examples/no_executor_framework.cpp
index 3aa401b..fd920f5 100644
--- a/src/examples/no_executor_framework.cpp
+++ b/src/examples/no_executor_framework.cpp
@@ -292,7 +292,6 @@ public:
 int main(int argc, char** argv)
 {
   Flags flags;
-
   Try<flags::Warnings> load = flags.load("MESOS_", argc, argv);
 
   if (flags.help) {

http://git-wip-us.apache.org/repos/asf/mesos/blob/dcfa2f90/src/examples/persistent_volume_framework.cpp
----------------------------------------------------------------------
diff --git a/src/examples/persistent_volume_framework.cpp b/src/examples/persistent_volume_framework.cpp
index 0c86808..1f8f4be 100644
--- a/src/examples/persistent_volume_framework.cpp
+++ b/src/examples/persistent_volume_framework.cpp
@@ -540,19 +540,18 @@ public:
 int main(int argc, char** argv)
 {
   Flags flags;
-
   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 (load.isError()) {
+    cerr << flags.usage(load.error()) << endl;
+    return EXIT_FAILURE;
+  }
+
   if (flags.master.isNone()) {
     cerr << flags.usage("Missing required option --master") << endl;
     return EXIT_FAILURE;


[3/7] mesos git commit: Updated `logging::initialize()` to make flags optional.

Posted by al...@apache.org.
Updated `logging::initialize()` to make flags optional.

This will be used to initialize logging in the main functions
that do not use `mesos::internal::logging::Flags`.

Review: https://reviews.apache.org/r/62018/


Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/0cd254f0
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/0cd254f0
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/0cd254f0

Branch: refs/heads/master
Commit: 0cd254f0f9aea2d638da36fb50a41318e5ba1d16
Parents: 0b83432
Author: Armand Grillet <ag...@mesosphere.io>
Authored: Mon Sep 18 20:44:05 2017 +0200
Committer: Alexander Rukletsov <al...@apache.org>
Committed: Mon Sep 18 23:21:47 2017 +0200

----------------------------------------------------------------------
 src/logging/logging.cpp | 31 +++++++++++++++++++------------
 src/logging/logging.hpp |  2 +-
 2 files changed, 20 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/0cd254f0/src/logging/logging.cpp
----------------------------------------------------------------------
diff --git a/src/logging/logging.cpp b/src/logging/logging.cpp
index 70d66a5..7085ab9 100644
--- a/src/logging/logging.cpp
+++ b/src/logging/logging.cpp
@@ -48,6 +48,8 @@ using fLB::FLAGS_drop_log_memory;
 
 using process::Once;
 
+using std::cerr;
+using std::endl;
 using std::string;
 
 // Captures the stack trace and exits when a pure virtual method is
@@ -121,7 +123,7 @@ google::LogSeverity getLogSeverity(const string& logging_level)
 
 void initialize(
     const string& _argv0,
-    const Flags& flags,
+    const Option<Flags>& _flags,
     bool installFailureSignalHandler)
 {
   static Once* initialized = new Once();
@@ -132,23 +134,30 @@ void initialize(
 
   argv0 = _argv0;
 
+  // Use the default flags if not specified.
+  Flags flags;
+  if (_flags.isSome()) {
+    flags = _flags.get();
+
+    FLAGS_minloglevel = getLogSeverity(flags.logging_level);
+    FLAGS_logbufsecs = flags.logbufsecs;
+  }
+
   if (flags.logging_level != "INFO" &&
       flags.logging_level != "WARNING" &&
       flags.logging_level != "ERROR") {
-    EXIT(EXIT_FAILURE)
-      << "'" << flags.logging_level
-      << "' is not a valid logging level. Possible values for"
-      << " 'logging_level' flag are: 'INFO', 'WARNING', 'ERROR'.";
+    cerr << "'" << flags.logging_level << "' is not a valid logging level."
+         << " Possible values for 'logging_level' flag are:"
+         << " 'INFO', 'WARNING', 'ERROR'." << endl;
+    exit(EXIT_FAILURE);
   }
 
-  FLAGS_minloglevel = getLogSeverity(flags.logging_level);
-
   if (flags.log_dir.isSome()) {
     Try<Nothing> mkdir = os::mkdir(flags.log_dir.get());
     if (mkdir.isError()) {
-      EXIT(EXIT_FAILURE)
-        << "Could not initialize logging: Failed to create directory "
-        << flags.log_dir.get() << ": " << mkdir.error();
+      cerr << "Could not initialize logging: Failed to create directory "
+           << flags.log_dir.get() << ": " << mkdir.error() << endl;
+      exit(EXIT_FAILURE);
     }
     FLAGS_log_dir = flags.log_dir.get();
     // Do not log to stderr instead of log files.
@@ -172,8 +181,6 @@ void initialize(
     FLAGS_stderrthreshold = FLAGS_minloglevel;
   }
 
-  FLAGS_logbufsecs = flags.logbufsecs;
-
 #ifdef __linux__
   // Do not drop in-memory buffers of log contents. When set to true, this flag
   // can significantly slow down the master. The slow down is attributed to

http://git-wip-us.apache.org/repos/asf/mesos/blob/0cd254f0/src/logging/logging.hpp
----------------------------------------------------------------------
diff --git a/src/logging/logging.hpp b/src/logging/logging.hpp
index 0e448f2..9ce1b1d 100644
--- a/src/logging/logging.hpp
+++ b/src/logging/logging.hpp
@@ -29,7 +29,7 @@ namespace logging {
 
 void initialize(
     const std::string& argv0,
-    const Flags& flags,
+    const Option<Flags>& _flags = None(),
     bool installFailureSignalHandler = false);
 
 


[4/7] mesos git commit: Fixed parameter name in uri/fetcher.hpp.

Posted by al...@apache.org.
Fixed parameter name in uri/fetcher.hpp.

The parameter used in uri/fetcher.cpp is named '_flags',
it is also now the case in uri/fetcher.hpp.

Review: https://reviews.apache.org/r/62122/


Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/0b83432c
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/0b83432c
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/0b83432c

Branch: refs/heads/master
Commit: 0b83432c06bec8e7bd04a0ed94dd1c27bc9cc432
Parents: b214d7a
Author: Armand Grillet <ag...@mesosphere.io>
Authored: Mon Sep 18 21:06:59 2017 +0200
Committer: Alexander Rukletsov <al...@apache.org>
Committed: Mon Sep 18 23:21:47 2017 +0200

----------------------------------------------------------------------
 src/uri/fetcher.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/0b83432c/src/uri/fetcher.hpp
----------------------------------------------------------------------
diff --git a/src/uri/fetcher.hpp b/src/uri/fetcher.hpp
index 7b91010..2b2b14e 100644
--- a/src/uri/fetcher.hpp
+++ b/src/uri/fetcher.hpp
@@ -52,7 +52,7 @@ class Flags :
 /**
  * Factory method for creating a Fetcher instance.
  */
-Try<process::Owned<Fetcher>> create(const Option<Flags>& flags = None());
+Try<process::Owned<Fetcher>> create(const Option<Flags>& _flags = None());
 
 } // namespace fetcher {
 } // namespace uri {


[5/7] mesos git commit: Updated logging initialization arguments.

Posted by al...@apache.org.
Updated logging initialization arguments.

The arguments `flags` and `installFailureSignalHandler` are now
swapped. The will allow the logging initialization to be more
broadly used in a future patch.

Review: https://reviews.apache.org/r/62357/


Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/a16e1d66
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/a16e1d66
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/a16e1d66

Branch: refs/heads/master
Commit: a16e1d66bfb2af6b3cd39afd24ee395eec209927
Parents: 0cd254f
Author: Armand Grillet <ag...@mesosphere.io>
Authored: Mon Sep 18 20:45:02 2017 +0200
Committer: Alexander Rukletsov <al...@apache.org>
Committed: Mon Sep 18 23:21:47 2017 +0200

----------------------------------------------------------------------
 src/docker/executor.cpp                      | 2 +-
 src/examples/load_generator_framework.cpp    | 2 +-
 src/examples/no_executor_framework.cpp       | 2 +-
 src/examples/persistent_volume_framework.cpp | 2 +-
 src/examples/test_framework.cpp              | 2 +-
 src/examples/test_http_framework.cpp         | 2 +-
 src/exec/exec.cpp                            | 2 +-
 src/executor/executor.cpp                    | 2 +-
 src/launcher/default_executor.cpp            | 2 +-
 src/launcher/executor.cpp                    | 2 +-
 src/launcher/fetcher.cpp                     | 2 +-
 src/local/main.cpp                           | 2 +-
 src/log/tool/benchmark.cpp                   | 2 +-
 src/log/tool/initialize.cpp                  | 2 +-
 src/log/tool/read.cpp                        | 2 +-
 src/log/tool/replica.cpp                     | 2 +-
 src/logging/logging.cpp                      | 4 ++--
 src/logging/logging.hpp                      | 4 ++--
 src/master/main.cpp                          | 2 +-
 src/sched/sched.cpp                          | 2 +-
 src/scheduler/scheduler.cpp                  | 2 +-
 src/slave/main.cpp                           | 2 +-
 src/tests/main.cpp                           | 2 +-
 23 files changed, 25 insertions(+), 25 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/a16e1d66/src/docker/executor.cpp
----------------------------------------------------------------------
diff --git a/src/docker/executor.cpp b/src/docker/executor.cpp
index e9949f6..3b0767f 100644
--- a/src/docker/executor.cpp
+++ b/src/docker/executor.cpp
@@ -806,7 +806,7 @@ int main(int argc, char** argv)
     return EXIT_FAILURE;
   }
 
-  mesos::internal::logging::initialize(argv[0], flags, true); // Catch signals.
+  mesos::internal::logging::initialize(argv[0], true, flags); // Catch signals.
 
   // Log any flag warnings (after logging is initialized).
   foreach (const flags::Warning& warning, load->warnings) {

http://git-wip-us.apache.org/repos/asf/mesos/blob/a16e1d66/src/examples/load_generator_framework.cpp
----------------------------------------------------------------------
diff --git a/src/examples/load_generator_framework.cpp b/src/examples/load_generator_framework.cpp
index 653ae81..63c88b4 100644
--- a/src/examples/load_generator_framework.cpp
+++ b/src/examples/load_generator_framework.cpp
@@ -314,7 +314,7 @@ int main(int argc, char** argv)
   }
 
   // We want the logger to catch failure signals.
-  mesos::internal::logging::initialize(argv[0], flags, true);
+  mesos::internal::logging::initialize(argv[0], true, flags);
 
   // Log any flag warnings (after logging is initialized).
   foreach (const flags::Warning& warning, load->warnings) {

http://git-wip-us.apache.org/repos/asf/mesos/blob/a16e1d66/src/examples/no_executor_framework.cpp
----------------------------------------------------------------------
diff --git a/src/examples/no_executor_framework.cpp b/src/examples/no_executor_framework.cpp
index 2ca240b..84fbf92 100644
--- a/src/examples/no_executor_framework.cpp
+++ b/src/examples/no_executor_framework.cpp
@@ -357,7 +357,7 @@ int main(int argc, char** argv)
 
   taskResources.allocate(framework.role());
 
-  logging::initialize(argv[0], flags, true); // Catch signals.
+  logging::initialize(argv[0], true, flags); // Catch signals.
 
   NoExecutorScheduler scheduler(
       framework,

http://git-wip-us.apache.org/repos/asf/mesos/blob/a16e1d66/src/examples/persistent_volume_framework.cpp
----------------------------------------------------------------------
diff --git a/src/examples/persistent_volume_framework.cpp b/src/examples/persistent_volume_framework.cpp
index bce2a2d..0c86808 100644
--- a/src/examples/persistent_volume_framework.cpp
+++ b/src/examples/persistent_volume_framework.cpp
@@ -558,7 +558,7 @@ int main(int argc, char** argv)
     return EXIT_FAILURE;
   }
 
-  logging::initialize(argv[0], flags, true); // Catch signals.
+  logging::initialize(argv[0], true, flags); // Catch signals.
 
   // Log any flag warnings (after logging is initialized).
   foreach (const flags::Warning& warning, load->warnings) {

http://git-wip-us.apache.org/repos/asf/mesos/blob/a16e1d66/src/examples/test_framework.cpp
----------------------------------------------------------------------
diff --git a/src/examples/test_framework.cpp b/src/examples/test_framework.cpp
index a6b38f0..8356d22 100644
--- a/src/examples/test_framework.cpp
+++ b/src/examples/test_framework.cpp
@@ -249,7 +249,7 @@ int main(int argc, char** argv)
     exit(EXIT_FAILURE);
   }
 
-  internal::logging::initialize(argv[0], flags, true); // Catch signals.
+  internal::logging::initialize(argv[0], true, flags); // Catch signals.
 
   // Log any flag warnings (after logging is initialized).
   foreach (const flags::Warning& warning, load->warnings) {

http://git-wip-us.apache.org/repos/asf/mesos/blob/a16e1d66/src/examples/test_http_framework.cpp
----------------------------------------------------------------------
diff --git a/src/examples/test_http_framework.cpp b/src/examples/test_http_framework.cpp
index 693dd47..5665b4d 100644
--- a/src/examples/test_http_framework.cpp
+++ b/src/examples/test_http_framework.cpp
@@ -428,7 +428,7 @@ int main(int argc, char** argv)
   }
 
   process::initialize();
-  mesos::internal::logging::initialize(argv[0], flags, true); // Catch signals.
+  mesos::internal::logging::initialize(argv[0], true, flags); // Catch signals.
 
   // Log any flag warnings (after logging is initialized).
   foreach (const flags::Warning& warning, load->warnings) {

http://git-wip-us.apache.org/repos/asf/mesos/blob/a16e1d66/src/exec/exec.cpp
----------------------------------------------------------------------
diff --git a/src/exec/exec.cpp b/src/exec/exec.cpp
index 65c4575..cdbf149 100644
--- a/src/exec/exec.cpp
+++ b/src/exec/exec.cpp
@@ -649,7 +649,7 @@ MesosExecutorDriver::MesosExecutorDriver(mesos::Executor* _executor)
 
   // Initialize logging.
   if (flags.initialize_driver_logging) {
-    logging::initialize("mesos", flags);
+    logging::initialize("mesos", false, flags);
   } else {
     VLOG(1) << "Disabling initialization of GLOG logging";
   }

http://git-wip-us.apache.org/repos/asf/mesos/blob/a16e1d66/src/executor/executor.cpp
----------------------------------------------------------------------
diff --git a/src/executor/executor.cpp b/src/executor/executor.cpp
index 91bbd1e..7280951 100644
--- a/src/executor/executor.cpp
+++ b/src/executor/executor.cpp
@@ -179,7 +179,7 @@ public:
 
     // Initialize logging.
     if (flags.initialize_driver_logging) {
-      logging::initialize("mesos", flags);
+      logging::initialize("mesos", false, flags);
     } else {
       VLOG(1) << "Disabling initialization of GLOG logging";
     }

http://git-wip-us.apache.org/repos/asf/mesos/blob/a16e1d66/src/launcher/default_executor.cpp
----------------------------------------------------------------------
diff --git a/src/launcher/default_executor.cpp b/src/launcher/default_executor.cpp
index 106b7f2..136c000 100644
--- a/src/launcher/default_executor.cpp
+++ b/src/launcher/default_executor.cpp
@@ -1487,7 +1487,7 @@ int main(int argc, char** argv)
     return EXIT_FAILURE;
   }
 
-  mesos::internal::logging::initialize(argv[0], flags, true); // Catch signals.
+  mesos::internal::logging::initialize(argv[0], true, flags); // Catch signals.
 
   // Log any flag warnings (after logging is initialized).
   foreach (const flags::Warning& warning, load->warnings) {

http://git-wip-us.apache.org/repos/asf/mesos/blob/a16e1d66/src/launcher/executor.cpp
----------------------------------------------------------------------
diff --git a/src/launcher/executor.cpp b/src/launcher/executor.cpp
index 951597b..0131577 100644
--- a/src/launcher/executor.cpp
+++ b/src/launcher/executor.cpp
@@ -1227,7 +1227,7 @@ int main(int argc, char** argv)
     return EXIT_FAILURE;
   }
 
-  mesos::internal::logging::initialize(argv[0], flags, true); // Catch signals.
+  mesos::internal::logging::initialize(argv[0], true, flags); // Catch signals.
 
   // Log any flag warnings (after logging is initialized).
   foreach (const flags::Warning& warning, load->warnings) {

http://git-wip-us.apache.org/repos/asf/mesos/blob/a16e1d66/src/launcher/fetcher.cpp
----------------------------------------------------------------------
diff --git a/src/launcher/fetcher.cpp b/src/launcher/fetcher.cpp
index 42980f5..ff24ecb 100644
--- a/src/launcher/fetcher.cpp
+++ b/src/launcher/fetcher.cpp
@@ -519,7 +519,7 @@ int main(int argc, char* argv[])
 
   CHECK_SOME(load) << "Could not load flags: " << load.error();
 
-  logging::initialize(argv[0], flags, true); // Catch signals.
+  logging::initialize(argv[0], true, flags); // Catch signals.
 
   // Log any flag warnings (after logging is initialized).
   foreach (const flags::Warning& warning, load->warnings) {

http://git-wip-us.apache.org/repos/asf/mesos/blob/a16e1d66/src/local/main.cpp
----------------------------------------------------------------------
diff --git a/src/local/main.cpp b/src/local/main.cpp
index f6145b7..4d9be69 100644
--- a/src/local/main.cpp
+++ b/src/local/main.cpp
@@ -91,7 +91,7 @@ int main(int argc, char **argv)
     return EXIT_FAILURE;
   }
 
-  logging::initialize(argv[0], flags);
+  logging::initialize(argv[0], false, flags);
 
   // Log any flag warnings (after logging is initialized).
   foreach (const flags::Warning& warning, load->warnings) {

http://git-wip-us.apache.org/repos/asf/mesos/blob/a16e1d66/src/log/tool/benchmark.cpp
----------------------------------------------------------------------
diff --git a/src/log/tool/benchmark.cpp b/src/log/tool/benchmark.cpp
index 8264fda..b939e26 100644
--- a/src/log/tool/benchmark.cpp
+++ b/src/log/tool/benchmark.cpp
@@ -123,7 +123,7 @@ Try<Nothing> Benchmark::execute(int argc, char** argv)
     }
 
     process::initialize();
-    logging::initialize(argv[0], flags);
+    logging::initialize(argv[0], false, flags);
 
     // Log any flag warnings (after logging is initialized).
     foreach (const flags::Warning& warning, load->warnings) {

http://git-wip-us.apache.org/repos/asf/mesos/blob/a16e1d66/src/log/tool/initialize.cpp
----------------------------------------------------------------------
diff --git a/src/log/tool/initialize.cpp b/src/log/tool/initialize.cpp
index 6a12505..c0f8543 100644
--- a/src/log/tool/initialize.cpp
+++ b/src/log/tool/initialize.cpp
@@ -64,7 +64,7 @@ Try<Nothing> Initialize::execute(int argc, char** argv)
     }
 
     process::initialize();
-    logging::initialize(argv[0], flags);
+    logging::initialize(argv[0], false, flags);
 
     // Log any flag warnings (after logging is initialized).
     foreach (const flags::Warning& warning, load->warnings) {

http://git-wip-us.apache.org/repos/asf/mesos/blob/a16e1d66/src/log/tool/read.cpp
----------------------------------------------------------------------
diff --git a/src/log/tool/read.cpp b/src/log/tool/read.cpp
index 7b30898..50fb020 100644
--- a/src/log/tool/read.cpp
+++ b/src/log/tool/read.cpp
@@ -80,7 +80,7 @@ Try<Nothing> Read::execute(int argc, char** argv)
     }
 
     process::initialize();
-    logging::initialize(argv[0], flags);
+    logging::initialize(argv[0], false, flags);
 
     // Log any flag warnings (after logging is initialized).
     foreach (const flags::Warning& warning, load->warnings) {

http://git-wip-us.apache.org/repos/asf/mesos/blob/a16e1d66/src/log/tool/replica.cpp
----------------------------------------------------------------------
diff --git a/src/log/tool/replica.cpp b/src/log/tool/replica.cpp
index 45bd1f4..6c7183c 100644
--- a/src/log/tool/replica.cpp
+++ b/src/log/tool/replica.cpp
@@ -82,7 +82,7 @@ Try<Nothing> Replica::execute(int argc, char** argv)
     }
 
     process::initialize();
-    logging::initialize(argv[0], flags);
+    logging::initialize(argv[0], false, flags);
 
     // Log any flag warnings (after logging is initialized).
     foreach (const flags::Warning& warning, load->warnings) {

http://git-wip-us.apache.org/repos/asf/mesos/blob/a16e1d66/src/logging/logging.cpp
----------------------------------------------------------------------
diff --git a/src/logging/logging.cpp b/src/logging/logging.cpp
index 7085ab9..19dba7f 100644
--- a/src/logging/logging.cpp
+++ b/src/logging/logging.cpp
@@ -123,8 +123,8 @@ google::LogSeverity getLogSeverity(const string& logging_level)
 
 void initialize(
     const string& _argv0,
-    const Option<Flags>& _flags,
-    bool installFailureSignalHandler)
+    bool installFailureSignalHandler,
+    const Option<Flags>& _flags)
 {
   static Once* initialized = new Once();
 

http://git-wip-us.apache.org/repos/asf/mesos/blob/a16e1d66/src/logging/logging.hpp
----------------------------------------------------------------------
diff --git a/src/logging/logging.hpp b/src/logging/logging.hpp
index 9ce1b1d..a837ae8 100644
--- a/src/logging/logging.hpp
+++ b/src/logging/logging.hpp
@@ -29,8 +29,8 @@ namespace logging {
 
 void initialize(
     const std::string& argv0,
-    const Option<Flags>& _flags = None(),
-    bool installFailureSignalHandler = false);
+    bool installFailureSignalHandler,
+    const Option<Flags>& _flags = None());
 
 
 // Returns the log file for the provided severity level.

http://git-wip-us.apache.org/repos/asf/mesos/blob/a16e1d66/src/master/main.cpp
----------------------------------------------------------------------
diff --git a/src/master/main.cpp b/src/master/main.cpp
index 7e815bf..f65ce63 100644
--- a/src/master/main.cpp
+++ b/src/master/main.cpp
@@ -176,7 +176,7 @@ int main(int argc, char** argv)
     return EXIT_FAILURE;
   }
 
-  logging::initialize(argv[0], flags, true); // Catch signals.
+  logging::initialize(argv[0], true, flags); // Catch signals.
 
   // Log any flag warnings (after logging is initialized).
   foreach (const flags::Warning& warning, load->warnings) {

http://git-wip-us.apache.org/repos/asf/mesos/blob/a16e1d66/src/sched/sched.cpp
----------------------------------------------------------------------
diff --git a/src/sched/sched.cpp b/src/sched/sched.cpp
index ef73c1d..09f255e 100644
--- a/src/sched/sched.cpp
+++ b/src/sched/sched.cpp
@@ -1735,7 +1735,7 @@ void MesosSchedulerDriver::initialize() {
   // Initialize logging.
   // TODO(benh): Replace whitespace in framework.name() with '_'?
   if (flags.initialize_driver_logging) {
-    logging::initialize(framework.name(), flags);
+    logging::initialize(framework.name(), false, flags);
   } else {
     VLOG(1) << "Disabling initialization of GLOG logging";
   }

http://git-wip-us.apache.org/repos/asf/mesos/blob/a16e1d66/src/scheduler/scheduler.cpp
----------------------------------------------------------------------
diff --git a/src/scheduler/scheduler.cpp b/src/scheduler/scheduler.cpp
index ce69258..78f5370 100644
--- a/src/scheduler/scheduler.cpp
+++ b/src/scheduler/scheduler.cpp
@@ -176,7 +176,7 @@ public:
 
     // Initialize logging.
     if (flags.initialize_driver_logging) {
-      logging::initialize("mesos", flags);
+      logging::initialize("mesos", false, flags);
     } else {
       VLOG(1) << "Disabling initialization of GLOG logging";
     }

http://git-wip-us.apache.org/repos/asf/mesos/blob/a16e1d66/src/slave/main.cpp
----------------------------------------------------------------------
diff --git a/src/slave/main.cpp b/src/slave/main.cpp
index d53ff50..94431b0 100644
--- a/src/slave/main.cpp
+++ b/src/slave/main.cpp
@@ -268,7 +268,7 @@ int main(int argc, char** argv)
     return EXIT_FAILURE;
   }
 
-  logging::initialize(argv[0], flags, true); // Catch signals.
+  logging::initialize(argv[0], true, flags); // Catch signals.
 
   // Log any flag warnings (after logging is initialized).
   foreach (const flags::Warning& warning, load->warnings) {

http://git-wip-us.apache.org/repos/asf/mesos/blob/a16e1d66/src/tests/main.cpp
----------------------------------------------------------------------
diff --git a/src/tests/main.cpp b/src/tests/main.cpp
index a7dc99b..6911b64 100644
--- a/src/tests/main.cpp
+++ b/src/tests/main.cpp
@@ -142,7 +142,7 @@ int main(int argc, char** argv)
   }
 
   // Initialize logging.
-  logging::initialize(argv[0], flags, true);
+  logging::initialize(argv[0], true, flags);
 
   // Log any flag warnings (after logging is initialized).
   foreach (const flags::Warning& warning, load->warnings) {