git commit: Split messages_launch_tasks into messages_launch_tasks and messages_decline_offers.

[vi...@apache.org]

Repository: mesos
Updated Branches:
  refs/heads/master 9c146e3de -> 58da2a86e


Split messages_launch_tasks into messages_launch_tasks and messages_decline_offers.

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


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

Branch: refs/heads/master
Commit: 58da2a86e85f0eaf3eea0ee7a2a8700c214e621a
Parents: 9c146e3
Author: Vinod Kone <vi...@gmail.com>
Authored: Fri Oct 3 13:58:42 2014 -0700
Committer: Vinod Kone <vi...@gmail.com>
Committed: Mon Oct 6 12:02:56 2014 -0700

----------------------------------------------------------------------
 src/master/master.cpp      | 10 +++++++++-
 src/master/master.hpp      |  1 +
 src/tests/master_tests.cpp |  1 +
 3 files changed, 11 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/58da2a86/src/master/master.cpp
----------------------------------------------------------------------
diff --git a/src/master/master.cpp b/src/master/master.cpp
index a60308f..f05275b 100644
--- a/src/master/master.cpp
+++ b/src/master/master.cpp
@@ -2182,7 +2182,11 @@ void Master::launchTasks(
     const Filters& filters,
     const vector<OfferID>& offerIds)
 {
-  ++metrics.messages_launch_tasks;
+  if (!tasks.empty()) {
+    ++metrics.messages_launch_tasks;
+  } else {
+    ++metrics.messages_decline_offers;
+  }
 
   Framework* framework = getFramework(frameworkId);
 
@@ -4866,6 +4870,8 @@ Master::Metrics::Metrics(const Master& master)
         "master/messages_resource_request"),
     messages_launch_tasks(
         "master/messages_launch_tasks"),
+    messages_decline_offers(
+        "master/messages_decline_offers"),
     messages_revive_offers(
         "master/messages_revive_offers"),
     messages_reconcile_tasks(
@@ -4949,6 +4955,7 @@ Master::Metrics::Metrics(const Master& master)
   process::metrics::add(messages_status_update_acknowledgement);
   process::metrics::add(messages_resource_request);
   process::metrics::add(messages_launch_tasks);
+  process::metrics::add(messages_decline_offers);
   process::metrics::add(messages_revive_offers);
   process::metrics::add(messages_reconcile_tasks);
   process::metrics::add(messages_framework_to_executor);
@@ -5046,6 +5053,7 @@ Master::Metrics::~Metrics()
   process::metrics::remove(messages_status_update_acknowledgement);
   process::metrics::remove(messages_resource_request);
   process::metrics::remove(messages_launch_tasks);
+  process::metrics::remove(messages_decline_offers);
   process::metrics::remove(messages_revive_offers);
   process::metrics::remove(messages_reconcile_tasks);
   process::metrics::remove(messages_framework_to_executor);

http://git-wip-us.apache.org/repos/asf/mesos/blob/58da2a86/src/master/master.hpp
----------------------------------------------------------------------
diff --git a/src/master/master.hpp b/src/master/master.hpp
index d638019..0bf4546 100644
--- a/src/master/master.hpp
+++ b/src/master/master.hpp
@@ -681,6 +681,7 @@ private:
     process::metrics::Counter messages_status_update_acknowledgement;
     process::metrics::Counter messages_resource_request;
     process::metrics::Counter messages_launch_tasks;
+    process::metrics::Counter messages_decline_offers;
     process::metrics::Counter messages_revive_offers;
     process::metrics::Counter messages_reconcile_tasks;
     process::metrics::Counter messages_framework_to_executor;

http://git-wip-us.apache.org/repos/asf/mesos/blob/58da2a86/src/tests/master_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/master_tests.cpp b/src/tests/master_tests.cpp
index 705e5f2..d9dc40c 100644
--- a/src/tests/master_tests.cpp
+++ b/src/tests/master_tests.cpp
@@ -1465,6 +1465,7 @@ TEST_F(MasterTest, MetricsInStatsEndpoint)
       "master/messages_status_update_acknowledgement"));
   EXPECT_EQ(1u, stats.values.count("master/messages_resource_request"));
   EXPECT_EQ(1u, stats.values.count("master/messages_launch_tasks"));
+  EXPECT_EQ(1u, stats.values.count("master/messages_decline_offers"));
   EXPECT_EQ(1u, stats.values.count("master/messages_revive_offers"));
   EXPECT_EQ(1u, stats.values.count("master/messages_reconcile_tasks"));
   EXPECT_EQ(1u, stats.values.count("master/messages_framework_to_executor"));