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 2017/01/24 01:07:49 UTC
[09/25] mesos git commit: Added TASK_UNREACHABLE to master's
state-summary endpoint.
Added TASK_UNREACHABLE to master's state-summary endpoint.
Review: https://reviews.apache.org/r/54312/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/b5711fdd
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/b5711fdd
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/b5711fdd
Branch: refs/heads/master
Commit: b5711fdd12998a1b5bba206066b09a93ffc1a087
Parents: 482796b
Author: Neil Conway <ne...@gmail.com>
Authored: Mon Jan 23 17:04:00 2017 -0800
Committer: Vinod Kone <vi...@gmail.com>
Committed: Mon Jan 23 17:07:22 2017 -0800
----------------------------------------------------------------------
src/master/http.cpp | 10 +++-
src/tests/partition_tests.cpp | 93 ++++++++++++++++++++++++++++++++++++++
2 files changed, 101 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/b5711fdd/src/master/http.cpp
----------------------------------------------------------------------
diff --git a/src/master/http.cpp b/src/master/http.cpp
index 51734e5..3dc83dd 100644
--- a/src/master/http.cpp
+++ b/src/master/http.cpp
@@ -3108,7 +3108,11 @@ Future<Response> Master::Http::stateSummary(
const TaskStateSummary& summary =
taskStateSummaries.slave(slave->id);
- // TODO(neilc): Update for new PARTITION_AWARE task statuses.
+ // Certain per-agent status totals will always be zero
+ // (e.g., TASK_ERROR, TASK_UNREACHABLE). We report them
+ // here anyway, for completeness.
+ //
+ // TODO(neilc): Update for TASK_GONE and TASK_GONE_BY_OPERATOR.
writer->field("TASK_STAGING", summary.staging);
writer->field("TASK_STARTING", summary.starting);
writer->field("TASK_RUNNING", summary.running);
@@ -3118,6 +3122,7 @@ Future<Response> Master::Http::stateSummary(
writer->field("TASK_FAILED", summary.failed);
writer->field("TASK_LOST", summary.lost);
writer->field("TASK_ERROR", summary.error);
+ writer->field("TASK_UNREACHABLE", summary.unreachable);
// Add the ids of all the frameworks running on this slave.
const hashset<FrameworkID>& frameworks =
@@ -3162,7 +3167,7 @@ Future<Response> Master::Http::stateSummary(
const TaskStateSummary& summary =
taskStateSummaries.framework(frameworkId);
- // TODO(neilc): Update for new PARTITION_AWARE task statuses.
+ // TODO(neilc): Update for TASK_GONE and TASK_GONE_BY_OPERATOR.
writer->field("TASK_STAGING", summary.staging);
writer->field("TASK_STARTING", summary.starting);
writer->field("TASK_RUNNING", summary.running);
@@ -3172,6 +3177,7 @@ Future<Response> Master::Http::stateSummary(
writer->field("TASK_FAILED", summary.failed);
writer->field("TASK_LOST", summary.lost);
writer->field("TASK_ERROR", summary.error);
+ writer->field("TASK_UNREACHABLE", summary.unreachable);
// Add the ids of all the slaves running this framework.
const hashset<SlaveID>& slaves =
http://git-wip-us.apache.org/repos/asf/mesos/blob/b5711fdd/src/tests/partition_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/partition_tests.cpp b/src/tests/partition_tests.cpp
index 47f6dc9..6961ff6 100644
--- a/src/tests/partition_tests.cpp
+++ b/src/tests/partition_tests.cpp
@@ -351,6 +351,30 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(PartitionTest, ReregisterSlavePartitionAware)
jsonTask.values["state"].as<JSON::String>().value);
}
+ // Check the master's "/state-summary" endpoint.
+ {
+ Future<Response> response = process::http::get(
+ master.get()->pid,
+ "state-summary",
+ None(),
+ createBasicAuthHeaders(DEFAULT_CREDENTIAL));
+
+ AWAIT_EXPECT_RESPONSE_STATUS_EQ(OK().status, response);
+ AWAIT_EXPECT_RESPONSE_HEADER_EQ(APPLICATION_JSON, "Content-Type", response);
+
+ Try<JSON::Object> parse = JSON::parse<JSON::Object>(response->body);
+ ASSERT_SOME(parse);
+ JSON::Array frameworks = parse->values["frameworks"].as<JSON::Array>();
+
+ ASSERT_EQ(1u, frameworks.values.size());
+
+ JSON::Object framework = frameworks.values.front().as<JSON::Object>();
+
+ EXPECT_EQ(0, framework.values["TASK_LOST"].as<JSON::Number>());
+ EXPECT_EQ(0, framework.values["TASK_RUNNING"].as<JSON::Number>());
+ EXPECT_EQ(1, framework.values["TASK_UNREACHABLE"].as<JSON::Number>());
+ }
+
// We now complete the partition on the slave side as well. We
// simulate a master loss event, which would normally happen during
// a network partition. The slave should then reregister with the
@@ -454,6 +478,31 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(PartitionTest, ReregisterSlavePartitionAware)
jsonTask.values["state"].as<JSON::String>().value);
}
+ // Check the master's "/state-summary" endpoint.
+ {
+ Future<Response> response = process::http::get(
+ master.get()->pid,
+ "state-summary",
+ None(),
+ createBasicAuthHeaders(DEFAULT_CREDENTIAL));
+
+ AWAIT_EXPECT_RESPONSE_STATUS_EQ(OK().status, response);
+ AWAIT_EXPECT_RESPONSE_HEADER_EQ(APPLICATION_JSON, "Content-Type", response);
+
+ Try<JSON::Object> parse = JSON::parse<JSON::Object>(response->body);
+ ASSERT_SOME(parse);
+
+ JSON::Array frameworks = parse->values["frameworks"].as<JSON::Array>();
+
+ ASSERT_EQ(1u, frameworks.values.size());
+
+ JSON::Object framework = frameworks.values.front().as<JSON::Object>();
+
+ EXPECT_EQ(0, framework.values["TASK_LOST"].as<JSON::Number>());
+ EXPECT_EQ(0, framework.values["TASK_UNREACHABLE"].as<JSON::Number>());
+ EXPECT_EQ(1, framework.values["TASK_RUNNING"].as<JSON::Number>());
+ }
+
driver.stop();
driver.join();
}
@@ -707,6 +756,31 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(PartitionTest, ReregisterSlaveNotPartitionAware)
completedTask.values["state"].as<JSON::String>().value);
}
+ // Check the master's "/state-summary" endpoint.
+ {
+ Future<Response> response = process::http::get(
+ master.get()->pid,
+ "state-summary",
+ None(),
+ createBasicAuthHeaders(DEFAULT_CREDENTIAL));
+
+ AWAIT_EXPECT_RESPONSE_STATUS_EQ(OK().status, response);
+ AWAIT_EXPECT_RESPONSE_HEADER_EQ(APPLICATION_JSON, "Content-Type", response);
+
+ Try<JSON::Object> parse = JSON::parse<JSON::Object>(response->body);
+ ASSERT_SOME(parse);
+
+ JSON::Array frameworks = parse->values["frameworks"].as<JSON::Array>();
+
+ ASSERT_EQ(1u, frameworks.values.size());
+
+ JSON::Object framework = frameworks.values.front().as<JSON::Object>();
+
+ EXPECT_EQ(0, framework.values["TASK_RUNNING"].as<JSON::Number>());
+ EXPECT_EQ(0, framework.values["TASK_UNREACHABLE"].as<JSON::Number>());
+ EXPECT_EQ(1, framework.values["TASK_LOST"].as<JSON::Number>());
+ }
+
driver.stop();
driver.join();
}
@@ -1209,6 +1283,25 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(PartitionTest, PartitionedSlaveOrphanedTask)
completedTask.values["state"].as<JSON::String>().value);
}
+ // Check the master's "/state-summary" endpoint.
+ {
+ Future<Response> response = process::http::get(
+ master.get()->pid,
+ "state-summary",
+ None(),
+ createBasicAuthHeaders(DEFAULT_CREDENTIAL));
+
+ AWAIT_EXPECT_RESPONSE_STATUS_EQ(OK().status, response);
+ AWAIT_EXPECT_RESPONSE_HEADER_EQ(APPLICATION_JSON, "Content-Type", response);
+
+ Try<JSON::Object> parse = JSON::parse<JSON::Object>(response->body);
+ ASSERT_SOME(parse);
+
+ JSON::Array frameworks = parse->values["frameworks"].as<JSON::Array>();
+
+ EXPECT_TRUE( frameworks.values.empty());
+ }
+
// Also check the master's "/tasks" endpoint.
{
Future<Response> response = process::http::get(