Repository: mesos Updated Branches: refs/heads/master 2c277f1c0 -> c68c3bd58
Revert "Integer Precision for JSON <-> Protobuf conversions." This reverts commit 2c277f1c0e0dc0a6618ba930bb5f8d9dd753d4be. Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/ceb832b1 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/ceb832b1 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/ceb832b1 Branch: refs/heads/master Commit: ceb832b10ba99b16aa6f69825805aebd36da9092 Parents: 2c277f1 Author: Joris Van Remoortere <[email protected]> Authored: Wed Sep 16 18:42:28 2015 -0400 Committer: Joris Van Remoortere <[email protected]> Committed: Wed Sep 16 18:42:28 2015 -0400 ---------------------------------------------------------------------- src/docker/docker.cpp | 3 +- .../provisioners/docker/token_manager.cpp | 3 +- src/tests/fault_tolerance_tests.cpp | 2 +- src/tests/master_tests.cpp | 2 +- src/tests/monitor_tests.cpp | 50 ++++++--- src/tests/rate_limiting_tests.cpp | 106 ++++++------------- src/tests/slave_tests.cpp | 2 +- 7 files changed, 75 insertions(+), 93 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/ceb832b1/src/docker/docker.cpp ---------------------------------------------------------------------- diff --git a/src/docker/docker.cpp b/src/docker/docker.cpp index afcedf1..c4c37cb 100755 --- a/src/docker/docker.cpp +++ b/src/docker/docker.cpp @@ -236,7 +236,6 @@ Try<Nothing> Docker::validateVersion(const Version& minVersion) const } -// TODO(josephw): Parse this string with a protobuf. Try<Docker::Container> Docker::Container::create(const string& output) { Try<JSON::Array> parse = JSON::parse<JSON::Array>(output); @@ -287,7 +286,7 @@ Try<Docker::Container> Docker::Container::create(const string& output) return Error("Error finding Pid in State: " + pidValue.error()); } - pid_t pid = pid_t(pidValue.get().as<int64_t>()); + pid_t pid = pid_t(pidValue.get().value); Option<pid_t> optionalPid; if (pid != 0) { http://git-wip-us.apache.org/repos/asf/mesos/blob/ceb832b1/src/slave/containerizer/provisioners/docker/token_manager.cpp ---------------------------------------------------------------------- diff --git a/src/slave/containerizer/provisioners/docker/token_manager.cpp b/src/slave/containerizer/provisioners/docker/token_manager.cpp index 95f459d..aec915f 100644 --- a/src/slave/containerizer/provisioners/docker/token_manager.cpp +++ b/src/slave/containerizer/provisioners/docker/token_manager.cpp @@ -122,7 +122,6 @@ Token::Token( notBefore(_notBefore) {} -// TODO(josephw): Parse this string with some protobufs. Try<Token> Token::create(const string& raw) { auto decode = []( @@ -197,7 +196,7 @@ Result<Time> Token::getTimeValue(const JSON::Object& object, const string& key) // If expiration is provided, we will process it for future validations. if (jsonValue.isSome()) { - Try<Time> time = Time::create(jsonValue.get().as<double>()); + Try<Time> time = Time::create(jsonValue.get().value); if (time.isError()) { return Error("Failed to decode time: " + time.error()); } http://git-wip-us.apache.org/repos/asf/mesos/blob/ceb832b1/src/tests/fault_tolerance_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/fault_tolerance_tests.cpp b/src/tests/fault_tolerance_tests.cpp index c97bc46..061e099 100644 --- a/src/tests/fault_tolerance_tests.cpp +++ b/src/tests/fault_tolerance_tests.cpp @@ -1918,7 +1918,7 @@ TEST_F(FaultToleranceTest, UpdateFrameworkInfoOnSchedulerFailover) EXPECT_EQ(1u, framework.values.count("failover_timeout")); JSON::Number failoverTimeout = framework.values["failover_timeout"].as<JSON::Number>(); - EXPECT_EQ(finfo2.failover_timeout(), failoverTimeout.as<double>()); + EXPECT_EQ(finfo2.failover_timeout(), failoverTimeout.value); EXPECT_EQ(1u, framework.values.count("hostname")); JSON::String hostname = framework.values["hostname"].as<JSON::String>(); http://git-wip-us.apache.org/repos/asf/mesos/blob/ceb832b1/src/tests/master_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/master_tests.cpp b/src/tests/master_tests.cpp index e4c89ab..dd65fcc 100644 --- a/src/tests/master_tests.cpp +++ b/src/tests/master_tests.cpp @@ -2826,7 +2826,7 @@ TEST_F(MasterTest, StateEndpoint) ASSERT_TRUE(state.values["start_time"].is<JSON::Number>()); EXPECT_EQ( static_cast<int>(Clock::now().secs()), - state.values["start_time"].as<JSON::Number>().as<int>()); + static_cast<int>(state.values["start_time"].as<JSON::Number>().value)); ASSERT_TRUE(state.values["id"].is<JSON::String>()); EXPECT_NE("", state.values["id"].as<JSON::String>().value); http://git-wip-us.apache.org/repos/asf/mesos/blob/ceb832b1/src/tests/monitor_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/monitor_tests.cpp b/src/tests/monitor_tests.cpp index 583e711..f404955 100644 --- a/src/tests/monitor_tests.cpp +++ b/src/tests/monitor_tests.cpp @@ -106,18 +106,44 @@ TEST(MonitorTest, Statistics) "Content-Type", response); - JSON::Array expected; - JSON::Object usage; - usage.values["executor_id"] = "executor"; - usage.values["executor_name"] = "name"; - usage.values["framework_id"] = "framework"; - usage.values["source"] = "source"; - usage.values["statistics"] = JSON::Protobuf(statistics); - expected.values.push_back(usage); - - Try<JSON::Array> result = JSON::parse<JSON::Array>(response.get().body); - ASSERT_SOME(result); - ASSERT_EQ(expected, result.get()); + // TODO(bmahler): Use JSON equality instead to avoid having to use + // numeric limits for double precision. + AWAIT_EXPECT_RESPONSE_BODY_EQ( + strings::format( + "[{" + "\"executor_id\":\"executor\"," + "\"executor_name\":\"name\"," + "\"framework_id\":\"framework\"," + "\"source\":\"source\"," + "\"statistics\":{" + "\"cpus_limit\":%g," + "\"cpus_nr_periods\":%d," + "\"cpus_nr_throttled\":%d," + "\"cpus_system_time_secs\":%g," + "\"cpus_throttled_time_secs\":%g," + "\"cpus_user_time_secs\":%g," + "\"mem_anon_bytes\":%lu," + "\"mem_file_bytes\":%lu," + "\"mem_limit_bytes\":%lu," + "\"mem_mapped_file_bytes\":%lu," + "\"mem_rss_bytes\":%lu," + "\"timestamp\":" + "%." + stringify(numeric_limits<double>::digits10) + "g" + "}" + "}]", + statistics.cpus_limit(), + statistics.cpus_nr_periods(), + statistics.cpus_nr_throttled(), + statistics.cpus_system_time_secs(), + statistics.cpus_throttled_time_secs(), + statistics.cpus_user_time_secs(), + statistics.mem_anon_bytes(), + statistics.mem_file_bytes(), + statistics.mem_limit_bytes(), + statistics.mem_mapped_file_bytes(), + statistics.mem_rss_bytes(), + statistics.timestamp()).get(), + response); } http://git-wip-us.apache.org/repos/asf/mesos/blob/ceb832b1/src/tests/rate_limiting_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/rate_limiting_tests.cpp b/src/tests/rate_limiting_tests.cpp index e512aa6..f3aedde 100644 --- a/src/tests/rate_limiting_tests.cpp +++ b/src/tests/rate_limiting_tests.cpp @@ -166,16 +166,12 @@ TEST_F(RateLimitingTest, NoRateLimiting) const string& messages_received = "frameworks/" + DEFAULT_CREDENTIAL.principal() + "/messages_received"; EXPECT_EQ(1u, metrics.values.count(messages_received)); - EXPECT_EQ( - 1, - metrics.values[messages_received].as<JSON::Number>().as<int64_t>()); + EXPECT_EQ(1, metrics.values[messages_received].as<JSON::Number>().value); const string& messages_processed = "frameworks/" + DEFAULT_CREDENTIAL.principal() + "/messages_processed"; EXPECT_EQ(1u, metrics.values.count(messages_processed)); - EXPECT_EQ( - 1, - metrics.values[messages_processed].as<JSON::Number>().as<int64_t>()); + EXPECT_EQ(1, metrics.values[messages_processed].as<JSON::Number>().value); } Future<Nothing> removeFramework = @@ -274,16 +270,12 @@ TEST_F(RateLimitingTest, RateLimitingEnabled) const string& messages_received = "frameworks/" + DEFAULT_CREDENTIAL.principal() + "/messages_received"; EXPECT_EQ(1u, metrics.values.count(messages_received)); - EXPECT_EQ( - 1, - metrics.values[messages_received].as<JSON::Number>().as<int64_t>()); + EXPECT_EQ(1, metrics.values[messages_received].as<JSON::Number>().value); const string& messages_processed = "frameworks/" + DEFAULT_CREDENTIAL.principal() + "/messages_processed"; EXPECT_EQ(1u, metrics.values.count(messages_processed)); - EXPECT_EQ( - 1, - metrics.values[messages_processed].as<JSON::Number>().as<int64_t>()); + EXPECT_EQ(1, metrics.values[messages_processed].as<JSON::Number>().value); } // The 2nd message is throttled for a second. @@ -313,12 +305,8 @@ TEST_F(RateLimitingTest, RateLimitingEnabled) // The 2nd message is received and but not processed after half // a second because of throttling. - EXPECT_EQ( - 2, - metrics.values[messages_received].as<JSON::Number>().as<int64_t>()); - EXPECT_EQ( - 1, - metrics.values[messages_processed].as<JSON::Number>().as<int64_t>()); + EXPECT_EQ(2, metrics.values[messages_received].as<JSON::Number>().value); + EXPECT_EQ(1, metrics.values[messages_processed].as<JSON::Number>().value); EXPECT_TRUE(duplicateFrameworkRegisteredMessage.isPending()); } @@ -336,10 +324,8 @@ TEST_F(RateLimitingTest, RateLimitingEnabled) "frameworks/" + DEFAULT_CREDENTIAL.principal() + "/messages_processed"; EXPECT_EQ(1u, metrics.values.count(messages_processed)); - EXPECT_EQ( - 2, metrics.values[messages_received].as<JSON::Number>().as<int64_t>()); - EXPECT_EQ( - 2, metrics.values[messages_processed].as<JSON::Number>().as<int64_t>()); + EXPECT_EQ(2, metrics.values[messages_received].as<JSON::Number>().value); + EXPECT_EQ(2, metrics.values[messages_processed].as<JSON::Number>().value); EXPECT_EQ(DRIVER_STOPPED, driver.stop()); EXPECT_EQ(DRIVER_STOPPED, driver.join()); @@ -495,19 +481,19 @@ TEST_F(RateLimitingTest, DifferentPrincipalFrameworks) EXPECT_EQ( 2, metrics.values["frameworks/framework1/messages_received"] - .as<JSON::Number>().as<int64_t>()); + .as<JSON::Number>().value); EXPECT_EQ( 2, metrics.values["frameworks/framework2/messages_received"] - .as<JSON::Number>().as<int64_t>()); + .as<JSON::Number>().value); EXPECT_EQ( 1, metrics.values["frameworks/framework1/messages_processed"] - .as<JSON::Number>().as<int64_t>()); + .as<JSON::Number>().value); EXPECT_EQ( 1, metrics.values["frameworks/framework2/messages_processed"] - .as<JSON::Number>().as<int64_t>()); + .as<JSON::Number>().value); } // Advance for a second so the message from framework1 (1qps) @@ -522,11 +508,11 @@ TEST_F(RateLimitingTest, DifferentPrincipalFrameworks) EXPECT_EQ( 2, metrics.values["frameworks/framework1/messages_processed"] - .as<JSON::Number>().as<int64_t>()); + .as<JSON::Number>().value); EXPECT_EQ( 1, metrics.values["frameworks/framework2/messages_processed"] - .as<JSON::Number>().as<int64_t>()); + .as<JSON::Number>().value); // After another half a second framework2 (0.2qps)'s message is // processed as well. @@ -549,19 +535,19 @@ TEST_F(RateLimitingTest, DifferentPrincipalFrameworks) EXPECT_EQ( 2, metrics.values["frameworks/framework1/messages_received"] - .as<JSON::Number>().as<int64_t>()); + .as<JSON::Number>().value); EXPECT_EQ( 2, metrics.values["frameworks/framework2/messages_received"] - .as<JSON::Number>().as<int64_t>()); + .as<JSON::Number>().value); EXPECT_EQ( 2, metrics.values["frameworks/framework1/messages_processed"] - .as<JSON::Number>().as<int64_t>()); + .as<JSON::Number>().value); EXPECT_EQ( 2, metrics.values["frameworks/framework2/messages_processed"] - .as<JSON::Number>().as<int64_t>()); + .as<JSON::Number>().value); } // 3. Remove a framework and its message counters are deleted while @@ -719,16 +705,12 @@ TEST_F(RateLimitingTest, SamePrincipalFrameworks) const string& messages_received = "frameworks/" + DEFAULT_CREDENTIAL.principal() + "/messages_received"; EXPECT_EQ(1u, metrics.values.count(messages_received)); - EXPECT_EQ( - 2, - metrics.values[messages_received].as<JSON::Number>().as<int64_t>()); + EXPECT_EQ(2, metrics.values[messages_received].as<JSON::Number>().value); const string& messages_processed = "frameworks/" + DEFAULT_CREDENTIAL.principal() + "/messages_processed"; EXPECT_EQ(1u, metrics.values.count(messages_processed)); - EXPECT_EQ( - 1, - metrics.values[messages_processed].as<JSON::Number>().as<int64_t>()); + EXPECT_EQ(1, metrics.values[messages_processed].as<JSON::Number>().value); } // Advance for another half a second to make sure throttled @@ -846,16 +828,12 @@ TEST_F(RateLimitingTest, SchedulerFailover) const string& messages_received = "frameworks/" + DEFAULT_CREDENTIAL.principal() + "/messages_received"; EXPECT_EQ(1u, metrics.values.count(messages_received)); - EXPECT_EQ( - 1, - metrics.values[messages_received].as<JSON::Number>().as<int64_t>()); + EXPECT_EQ(1, metrics.values[messages_received].as<JSON::Number>().value); const string& messages_processed = "frameworks/" + DEFAULT_CREDENTIAL.principal() + "/messages_processed"; EXPECT_EQ(1u, metrics.values.count(messages_processed)); - EXPECT_EQ( - 1, - metrics.values[messages_processed].as<JSON::Number>().as<int64_t>()); + EXPECT_EQ(1, metrics.values[messages_processed].as<JSON::Number>().value); } // 2. Now launch the second (i.e., failover) scheduler using the @@ -920,16 +898,12 @@ TEST_F(RateLimitingTest, SchedulerFailover) const string& messages_received = "frameworks/" + DEFAULT_CREDENTIAL.principal() + "/messages_received"; EXPECT_EQ(1u, metrics.values.count(messages_received)); - EXPECT_EQ( - 2, - metrics.values[messages_received].as<JSON::Number>().as<int64_t>()); + EXPECT_EQ(2, metrics.values[messages_received].as<JSON::Number>().value); const string& messages_processed = "frameworks/" + DEFAULT_CREDENTIAL.principal() + "/messages_processed"; EXPECT_EQ(1u, metrics.values.count(messages_processed)); - EXPECT_EQ( - 1, - metrics.values[messages_processed].as<JSON::Number>().as<int64_t>()); + EXPECT_EQ(1, metrics.values[messages_processed].as<JSON::Number>().value); } // Need another half a second to have it processed. @@ -948,16 +922,12 @@ TEST_F(RateLimitingTest, SchedulerFailover) const string& messages_received = "frameworks/" + DEFAULT_CREDENTIAL.principal() + "/messages_received"; EXPECT_EQ(1u, metrics.values.count(messages_received)); - EXPECT_EQ( - 2, - metrics.values[messages_received].as<JSON::Number>().as<int64_t>()); + EXPECT_EQ(2, metrics.values[messages_received].as<JSON::Number>().value); const string& messages_processed = "frameworks/" + DEFAULT_CREDENTIAL.principal() + "/messages_processed"; EXPECT_EQ(1u, metrics.values.count(messages_processed)); - EXPECT_EQ( - 2, - metrics.values[messages_processed].as<JSON::Number>().as<int64_t>()); + EXPECT_EQ(2, metrics.values[messages_processed].as<JSON::Number>().value); } EXPECT_EQ(DRIVER_STOPPED, driver2.stop()); @@ -1042,16 +1012,12 @@ TEST_F(RateLimitingTest, CapacityReached) const string& messages_received = "frameworks/" + DEFAULT_CREDENTIAL.principal() + "/messages_received"; EXPECT_EQ(1u, metrics.values.count(messages_received)); - EXPECT_EQ( - 1, - metrics.values[messages_received].as<JSON::Number>().as<int64_t>()); + EXPECT_EQ(1, metrics.values[messages_received].as<JSON::Number>().value); const string& messages_processed = "frameworks/" + DEFAULT_CREDENTIAL.principal() + "/messages_processed"; EXPECT_EQ(1u, metrics.values.count(messages_processed)); - EXPECT_EQ( - 1, - metrics.values[messages_processed].as<JSON::Number>().as<int64_t>()); + EXPECT_EQ(1, metrics.values[messages_processed].as<JSON::Number>().value); } // The subsequent messages are going to be throttled. @@ -1098,16 +1064,12 @@ TEST_F(RateLimitingTest, CapacityReached) const string& messages_received = "frameworks/" + DEFAULT_CREDENTIAL.principal() + "/messages_received"; EXPECT_EQ(1u, metrics.values.count(messages_received)); - EXPECT_EQ( - 5, - metrics.values[messages_received].as<JSON::Number>().as<int64_t>()); + EXPECT_EQ(5, metrics.values[messages_received].as<JSON::Number>().value); const string& messages_processed = "frameworks/" + DEFAULT_CREDENTIAL.principal() + "/messages_processed"; EXPECT_EQ(1u, metrics.values.count(messages_processed)); // Four messages not processed, two in the queue and two dropped. - EXPECT_EQ( - 1, - metrics.values[messages_processed].as<JSON::Number>().as<int64_t>()); + EXPECT_EQ(1, metrics.values[messages_processed].as<JSON::Number>().value); } // Advance three times for the two pending messages and the exited @@ -1124,16 +1086,12 @@ TEST_F(RateLimitingTest, CapacityReached) const string& messages_received = "frameworks/" + DEFAULT_CREDENTIAL.principal() + "/messages_received"; EXPECT_EQ(1u, metrics.values.count(messages_received)); - EXPECT_EQ( - 5, - metrics.values[messages_received].as<JSON::Number>().as<int64_t>()); + EXPECT_EQ(5, metrics.values[messages_received].as<JSON::Number>().value); const string& messages_processed = "frameworks/" + DEFAULT_CREDENTIAL.principal() + "/messages_processed"; EXPECT_EQ(1u, metrics.values.count(messages_processed)); // Two messages are dropped. - EXPECT_EQ( - 3, - metrics.values[messages_processed].as<JSON::Number>().as<int64_t>()); + EXPECT_EQ(3, metrics.values[messages_processed].as<JSON::Number>().value); Shutdown(); } http://git-wip-us.apache.org/repos/asf/mesos/blob/ceb832b1/src/tests/slave_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/slave_tests.cpp b/src/tests/slave_tests.cpp index dbe9b1d..447c43c 100644 --- a/src/tests/slave_tests.cpp +++ b/src/tests/slave_tests.cpp @@ -1080,7 +1080,7 @@ TEST_F(SlaveTest, StateEndpoint) ASSERT_TRUE(state.values["start_time"].is<JSON::Number>()); EXPECT_EQ( static_cast<int>(Clock::now().secs()), - state.values["start_time"].as<JSON::Number>().as<int>()); + static_cast<int>(state.values["start_time"].as<JSON::Number>().value)); // TODO(bmahler): The slave must register for the 'id' // to be non-empty.
