You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by be...@apache.org on 2015/02/08 16:51:45 UTC
[18/20] mesos git commit: Replaced Node with Address in Mesos.
Replaced Node with Address in Mesos.
Review: https://reviews.apache.org/r/29539
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/4a935124
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/4a935124
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/4a935124
Branch: refs/heads/master
Commit: 4a9351243dec77f182fd34a861ec753aac170276
Parents: 257bd1a
Author: Benjamin Hindman <be...@gmail.com>
Authored: Thu Jan 1 17:29:36 2015 -0800
Committer: Benjamin Hindman <be...@gmail.com>
Committed: Sat Feb 7 14:46:44 2015 -0800
----------------------------------------------------------------------
src/common/protobuf_utils.cpp | 6 +-
src/master/master.cpp | 10 +--
src/sched/sched.cpp | 2 +-
src/scheduler/scheduler.cpp | 2 +-
src/slave/http.cpp | 6 +-
src/slave/slave.cpp | 6 +-
src/tests/fetcher_tests.cpp | 4 +-
src/tests/files_tests.cpp | 8 +--
src/tests/gc_tests.cpp | 6 +-
src/tests/logging_tests.cpp | 2 +-
src/tests/master_contender_detector_tests.cpp | 73 +++++++++++++---------
src/tests/master_tests.cpp | 12 ++--
src/tests/metrics_tests.cpp | 4 +-
src/tests/monitor_tests.cpp | 2 +-
14 files changed, 78 insertions(+), 65 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/4a935124/src/common/protobuf_utils.cpp
----------------------------------------------------------------------
diff --git a/src/common/protobuf_utils.cpp b/src/common/protobuf_utils.cpp
index 345d96e..af6b785 100644
--- a/src/common/protobuf_utils.cpp
+++ b/src/common/protobuf_utils.cpp
@@ -141,11 +141,11 @@ MasterInfo createMasterInfo(const process::UPID& pid)
{
MasterInfo info;
info.set_id(stringify(pid) + "-" + UUID::random().toString());
- info.set_ip(pid.node.ip);
- info.set_port(pid.node.port);
+ info.set_ip(pid.address.ip);
+ info.set_port(pid.address.port);
info.set_pid(pid);
- Try<string> hostname = net::getHostname(pid.node.ip);
+ Try<string> hostname = net::getHostname(pid.address.ip);
if (hostname.isSome()) {
info.set_hostname(hostname.get());
}
http://git-wip-us.apache.org/repos/asf/mesos/blob/4a935124/src/master/master.cpp
----------------------------------------------------------------------
diff --git a/src/master/master.cpp b/src/master/master.cpp
index bc1f8c9..7c3aa22 100644
--- a/src/master/master.cpp
+++ b/src/master/master.cpp
@@ -289,20 +289,20 @@ Master::Master(
// address and port from self() and the OS PID.
Try<string> id =
strings::format("%s-%u-%u-%d", DateUtils::currentDate(),
- self().node.ip, self().node.port, getpid());
+ self().address.ip, self().address.port, getpid());
CHECK(!id.isError()) << id.error();
info_.set_id(id.get());
- info_.set_ip(self().node.ip);
- info_.set_port(self().node.port);
+ info_.set_ip(self().address.ip);
+ info_.set_port(self().address.port);
info_.set_pid(self());
// Determine our hostname or use the hostname provided.
string hostname;
if (flags.hostname.isNone()) {
- Try<string> result = net::getHostname(self().node.ip);
+ Try<string> result = net::getHostname(self().address.ip);
if (result.isError()) {
LOG(FATAL) << "Failed to get hostname: " << result.error();
@@ -344,7 +344,7 @@ void Master::initialize()
LOG(INFO) << "Master " << info_.id() << " (" << info_.hostname() << ")"
<< " started on " << string(self()).substr(7);
- if (stringify(net::IP(ntohl(self().node.ip))) == "127.0.0.1") {
+ if (stringify(net::IP(ntohl(self().address.ip))) == "127.0.0.1") {
LOG(WARNING) << "\n**************************************************\n"
<< "Master bound to loopback interface!"
<< " Cannot communicate with remote schedulers or slaves."
http://git-wip-us.apache.org/repos/asf/mesos/blob/4a935124/src/sched/sched.cpp
----------------------------------------------------------------------
diff --git a/src/sched/sched.cpp b/src/sched/sched.cpp
index ce6ff6d..1af52b2 100644
--- a/src/sched/sched.cpp
+++ b/src/sched/sched.cpp
@@ -1239,7 +1239,7 @@ void MesosSchedulerDriver::initialize() {
// Initialize libprocess.
process::initialize(schedulerId);
- if (stringify(net::IP(ntohl(process::node().ip))) == "127.0.0.1") {
+ if (stringify(net::IP(ntohl(process::address().ip))) == "127.0.0.1") {
LOG(WARNING) << "\n**************************************************\n"
<< "Scheduler driver bound to loopback interface!"
<< " Cannot communicate with remote master(s)."
http://git-wip-us.apache.org/repos/asf/mesos/blob/4a935124/src/scheduler/scheduler.cpp
----------------------------------------------------------------------
diff --git a/src/scheduler/scheduler.cpp b/src/scheduler/scheduler.cpp
index f5ee1b0..de7d0bb 100644
--- a/src/scheduler/scheduler.cpp
+++ b/src/scheduler/scheduler.cpp
@@ -126,7 +126,7 @@ public:
// want to use flags to initialize libprocess).
process::initialize();
- if (stringify(net::IP(ntohl(self().node.ip))) == "127.0.0.1") {
+ if (stringify(net::IP(ntohl(self().address.ip))) == "127.0.0.1") {
LOG(WARNING) << "\n**************************************************\n"
<< "Scheduler driver bound to loopback interface!"
<< " Cannot communicate with remote master(s)."
http://git-wip-us.apache.org/repos/asf/mesos/blob/4a935124/src/slave/http.cpp
----------------------------------------------------------------------
diff --git a/src/slave/http.cpp b/src/slave/http.cpp
index c9b5731..80b02d6 100644
--- a/src/slave/http.cpp
+++ b/src/slave/http.cpp
@@ -360,9 +360,9 @@ Future<Response> Slave::Http::state(const Request& request)
object.values["lost_tasks"] = slave->stats.tasks[TASK_LOST];
if (slave->master.isSome()) {
- Try<string> masterHostname = net::getHostname(slave->master.get().node.ip);
- if (masterHostname.isSome()) {
- object.values["master_hostname"] = masterHostname.get();
+ Try<string> hostname = net::getHostname(slave->master.get().address.ip);
+ if (hostname.isSome()) {
+ object.values["master_hostname"] = hostname.get();
}
}
http://git-wip-us.apache.org/repos/asf/mesos/blob/4a935124/src/slave/slave.cpp
----------------------------------------------------------------------
diff --git a/src/slave/slave.cpp b/src/slave/slave.cpp
index 336e877..fff2d72 100644
--- a/src/slave/slave.cpp
+++ b/src/slave/slave.cpp
@@ -171,7 +171,7 @@ void Slave::initialize()
{
LOG(INFO) << "Slave started on " << string(self()).substr(6);
- if (stringify(net::IP(ntohl(self().node.ip))) == "127.0.0.1") {
+ if (stringify(net::IP(ntohl(self().address.ip))) == "127.0.0.1") {
LOG(WARNING) << "\n**************************************************\n"
<< "Slave bound to loopback interface!"
<< " Cannot communicate with remote master(s)."
@@ -307,7 +307,7 @@ void Slave::initialize()
string hostname;
if (flags.hostname.isNone()) {
- Try<string> result = net::getHostname(self().node.ip);
+ Try<string> result = net::getHostname(self().address.ip);
if (result.isError()) {
LOG(FATAL) << "Failed to get hostname: " << result.error();
@@ -320,7 +320,7 @@ void Slave::initialize()
// Initialize slave info.
info.set_hostname(hostname);
- info.set_port(self().node.port);
+ info.set_port(self().address.port);
info.mutable_resources()->CopyFrom(resources.get());
info.mutable_attributes()->CopyFrom(attributes);
info.set_checkpoint(flags.checkpoint);
http://git-wip-us.apache.org/repos/asf/mesos/blob/4a935124/src/tests/fetcher_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/fetcher_tests.cpp b/src/tests/fetcher_tests.cpp
index d7266f5..fcbf7ad 100644
--- a/src/tests/fetcher_tests.cpp
+++ b/src/tests/fetcher_tests.cpp
@@ -409,8 +409,8 @@ TEST_F(FetcherTest, OSNetUriTest)
spawn(process);
- string url = "http://" + net::getHostname(process.self().node.ip).get() +
- ":" + stringify(process.self().node.port) + "/help";
+ string url = "http://" + net::getHostname(process.self().address.ip).get() +
+ ":" + stringify(process.self().address.port) + "/help";
string localFile = path::join(os::getcwd(), "help");
EXPECT_FALSE(os::exists(localFile));
http://git-wip-us.apache.org/repos/asf/mesos/blob/4a935124/src/tests/files_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/files_tests.cpp b/src/tests/files_tests.cpp
index 2e16665..650f1b9 100644
--- a/src/tests/files_tests.cpp
+++ b/src/tests/files_tests.cpp
@@ -84,7 +84,7 @@ TEST_F(FilesTest, DetachTest)
TEST_F(FilesTest, ReadTest)
{
Files files;
- process::UPID upid("files", process::node());
+ process::UPID upid("files", process::address());
Future<Response> response =
process::http::get(upid, "read.json");
@@ -138,7 +138,7 @@ TEST_F(FilesTest, ReadTest)
TEST_F(FilesTest, ResolveTest)
{
Files files;
- process::UPID upid("files", process::node());
+ process::UPID upid("files", process::address());
// Test the directory / file resolution.
ASSERT_SOME(os::mkdir("1/2"));
@@ -214,7 +214,7 @@ TEST_F(FilesTest, ResolveTest)
TEST_F(FilesTest, BrowseTest)
{
Files files;
- process::UPID upid("files", process::node());
+ process::UPID upid("files", process::address());
ASSERT_SOME(os::mkdir("1/2"));
ASSERT_SOME(os::mkdir("1/3"));
@@ -267,7 +267,7 @@ TEST_F(FilesTest, BrowseTest)
TEST_F(FilesTest, DownloadTest)
{
Files files;
- process::UPID upid("files", process::node());
+ process::UPID upid("files", process::address());
// This is a one-pixel black gif image.
const unsigned char gifData[] = {
http://git-wip-us.apache.org/repos/asf/mesos/blob/4a935124/src/tests/gc_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/gc_tests.cpp b/src/tests/gc_tests.cpp
index 2cf7d16..45efce3 100644
--- a/src/tests/gc_tests.cpp
+++ b/src/tests/gc_tests.cpp
@@ -459,7 +459,7 @@ TEST_F(GarbageCollectorIntegrationTest, ExitedFramework)
ASSERT_FALSE(os::exists(frameworkDir));
- process::UPID filesUpid("files", process::node());
+ process::UPID filesUpid("files", process::address());
AWAIT_EXPECT_RESPONSE_STATUS_EQ(
process::http::NotFound().status,
process::http::get(filesUpid, "browse.json", "path=" + frameworkDir));
@@ -560,7 +560,7 @@ TEST_F(GarbageCollectorIntegrationTest, ExitedExecutor)
// Executor's directory should be gc'ed by now.
ASSERT_FALSE(os::exists(executorDir));
- process::UPID files("files", process::node());
+ process::UPID files("files", process::address());
AWAIT_EXPECT_RESPONSE_STATUS_EQ(
process::http::NotFound().status,
process::http::get(files, "browse.json", "path=" + executorDir));
@@ -675,7 +675,7 @@ TEST_F(GarbageCollectorIntegrationTest, DiskUsage)
// Executor's directory should be gc'ed by now.
ASSERT_FALSE(os::exists(executorDir));
- process::UPID files("files", process::node());
+ process::UPID files("files", process::address());
AWAIT_EXPECT_RESPONSE_STATUS_EQ(
process::http::NotFound().status,
process::http::get(files, "browse.json", "path=" + executorDir));
http://git-wip-us.apache.org/repos/asf/mesos/blob/4a935124/src/tests/logging_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/logging_tests.cpp b/src/tests/logging_tests.cpp
index dcfbe5f..0f2d30d 100644
--- a/src/tests/logging_tests.cpp
+++ b/src/tests/logging_tests.cpp
@@ -37,7 +37,7 @@ TEST(LoggingTest, Toggle)
{
process::PID<> pid;
pid.id = "logging";
- pid.node = process::node();
+ pid.address = process::address();
process::Future<Response> response = process::http::get(pid, "toggle");
http://git-wip-us.apache.org/repos/asf/mesos/blob/4a935124/src/tests/master_contender_detector_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/master_contender_detector_tests.cpp b/src/tests/master_contender_detector_tests.cpp
index e94cd79..78b1a6a 100644
--- a/src/tests/master_contender_detector_tests.cpp
+++ b/src/tests/master_contender_detector_tests.cpp
@@ -129,8 +129,8 @@ TEST_F(MasterContenderDetectorTest, File)
TEST(BasicMasterContenderDetectorTest, Contender)
{
PID<Master> master;
- master.node.ip = 10000000;
- master.node.port = 10000;
+ master.address.ip = 10000000;
+ master.address.port = 10000;
MasterContender* contender = new StandaloneMasterContender();
@@ -154,8 +154,8 @@ TEST(BasicMasterContenderDetectorTest, Contender)
TEST(BasicMasterContenderDetectorTest, Detector)
{
PID<Master> master;
- master.node.ip = 10000000;
- master.node.port = 10000;
+ master.address.ip = 10000000;
+ master.address.port = 10000;
StandaloneMasterDetector detector;
@@ -198,8 +198,9 @@ TEST_F(ZooKeeperMasterContenderDetectorTest, MasterContender)
ZooKeeperMasterContender* contender = new ZooKeeperMasterContender(group);
PID<Master> pid;
- pid.node.ip = 10000000;
- pid.node.port = 10000;
+ pid.address.ip = 10000000;
+ pid.address.port = 10000;
+
MasterInfo master = mesos::protobuf::createMasterInfo(pid);
contender->initialize(master);
@@ -256,8 +257,9 @@ TEST_F(ZooKeeperMasterContenderDetectorTest, ContenderPendingElection)
ZooKeeperMasterContender contender(url.get());
PID<Master> pid;
- pid.node.ip = 10000000;
- pid.node.port = 10000;
+ pid.address.ip = 10000000;
+ pid.address.port = 10000;
+
MasterInfo master = mesos::protobuf::createMasterInfo(pid);
contender.initialize(master);
@@ -310,8 +312,9 @@ TEST_F(ZooKeeperMasterContenderDetectorTest, MasterContenders)
new ZooKeeperMasterContender(url.get());
PID<Master> pid1;
- pid1.node.ip = 10000000;
- pid1.node.port = 10000;
+ pid1.address.ip = 10000000;
+ pid1.address.port = 10000;
+
MasterInfo master1 = mesos::protobuf::createMasterInfo(pid1);
contender1->initialize(master1);
@@ -328,8 +331,9 @@ TEST_F(ZooKeeperMasterContenderDetectorTest, MasterContenders)
ZooKeeperMasterContender contender2(url.get());
PID<Master> pid2;
- pid2.node.ip = 10000001;
- pid2.node.port = 10001;
+ pid2.address.ip = 10000001;
+ pid2.address.port = 10001;
+
MasterInfo master2 = mesos::protobuf::createMasterInfo(pid2);
contender2.initialize(master2);
@@ -367,8 +371,9 @@ TEST_F(ZooKeeperMasterContenderDetectorTest, NonRetryableFrrors)
AWAIT_READY(group1.join("data"));
PID<Master> pid;
- pid.node.ip = 10000000;
- pid.node.port = 10000;
+ pid.address.ip = 10000000;
+ pid.address.port = 10000;
+
MasterInfo master = mesos::protobuf::createMasterInfo(pid);
// group2's password is wrong and operations on it will fail.
@@ -431,8 +436,9 @@ TEST_F(ZooKeeperMasterContenderDetectorTest, ContenderDetectorShutdownNetwork)
ZooKeeperMasterContender contender(url.get());
PID<Master> pid;
- pid.node.ip = 10000000;
- pid.node.port = 10000;
+ pid.address.ip = 10000000;
+ pid.address.port = 10000;
+
MasterInfo master = mesos::protobuf::createMasterInfo(pid);
contender.initialize(master);
@@ -507,8 +513,9 @@ TEST_F(ZooKeeperMasterContenderDetectorTest, MasterDetectorTimedoutSession)
ZooKeeperMasterContender leaderContender(leaderGroup);
PID<Master> pid;
- pid.node.ip = 10000000;
- pid.node.port = 10000;
+ pid.address.ip = 10000000;
+ pid.address.port = 10000;
+
MasterInfo leader = mesos::protobuf::createMasterInfo(pid);
leaderContender.initialize(leader);
@@ -528,8 +535,9 @@ TEST_F(ZooKeeperMasterContenderDetectorTest, MasterDetectorTimedoutSession)
ZooKeeperMasterContender followerContender(followerGroup);
PID<Master> pid2;
- pid2.node.ip = 10000001;
- pid2.node.port = 10001;
+ pid2.address.ip = 10000001;
+ pid2.address.port = 10001;
+
MasterInfo follower = mesos::protobuf::createMasterInfo(pid2);
followerContender.initialize(follower);
@@ -617,8 +625,9 @@ TEST_F(ZooKeeperMasterContenderDetectorTest,
ASSERT_SOME(url);
PID<Master> pid;
- pid.node.ip = 10000000;
- pid.node.port = 10000;
+ pid.address.ip = 10000000;
+ pid.address.port = 10000;
+
MasterInfo leader = mesos::protobuf::createMasterInfo(pid);
// Create the group instance so we can expire its session.
@@ -646,8 +655,9 @@ TEST_F(ZooKeeperMasterContenderDetectorTest,
// Simulate a following master.
PID<Master> pid2;
- pid2.node.ip = 10000001;
- pid2.node.port = 10001;
+ pid2.address.ip = 10000001;
+ pid2.address.port = 10001;
+
MasterInfo follower = mesos::protobuf::createMasterInfo(pid2);
ZooKeeperMasterDetector followerDetector(url.get());
@@ -693,8 +703,9 @@ TEST_F(ZooKeeperMasterContenderDetectorTest, MasterDetectorExpireSlaveZKSession)
ASSERT_SOME(url);
PID<Master> pid;
- pid.node.ip = 10000000;
- pid.node.port = 10000;
+ pid.address.ip = 10000000;
+ pid.address.port = 10000;
+
MasterInfo master = mesos::protobuf::createMasterInfo(pid);
ZooKeeperMasterContender masterContender(url.get());
@@ -754,8 +765,9 @@ TEST_F(ZooKeeperMasterContenderDetectorTest,
ZooKeeperMasterDetector leaderDetector(leaderGroup);
PID<Master> pid;
- pid.node.ip = 10000000;
- pid.node.port = 10000;
+ pid.address.ip = 10000000;
+ pid.address.port = 10000;
+
MasterInfo leader = mesos::protobuf::createMasterInfo(pid);
leaderContender.initialize(leader);
@@ -774,8 +786,9 @@ TEST_F(ZooKeeperMasterContenderDetectorTest,
ZooKeeperMasterDetector followerDetector(followerGroup);
PID<Master> pid2;
- pid2.node.ip = 10000001;
- pid2.node.port = 10001;
+ pid2.address.ip = 10000001;
+ pid2.address.port = 10001;
+
MasterInfo follower = mesos::protobuf::createMasterInfo(pid2);
followerContender.initialize(follower);
http://git-wip-us.apache.org/repos/asf/mesos/blob/4a935124/src/tests/master_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/master_tests.cpp b/src/tests/master_tests.cpp
index 62ba35b..b52d2ca 100644
--- a/src/tests/master_tests.cpp
+++ b/src/tests/master_tests.cpp
@@ -964,8 +964,8 @@ TEST_F(MasterTest, MasterInfo)
driver.start();
AWAIT_READY(masterInfo);
- EXPECT_EQ(master.get().node.port, masterInfo.get().port());
- EXPECT_EQ(master.get().node.ip, masterInfo.get().ip());
+ EXPECT_EQ(master.get().address.port, masterInfo.get().port());
+ EXPECT_EQ(master.get().address.ip, masterInfo.get().ip());
driver.stop();
driver.join();
@@ -1022,8 +1022,8 @@ TEST_F(MasterTest, MasterInfoOnReElection)
AWAIT_READY(disconnected);
AWAIT_READY(masterInfo);
- EXPECT_EQ(master.get().node.port, masterInfo.get().port());
- EXPECT_EQ(master.get().node.ip, masterInfo.get().ip());
+ EXPECT_EQ(master.get().address.port, masterInfo.get().port());
+ EXPECT_EQ(master.get().address.ip, masterInfo.get().ip());
// The re-registered framework should get offers.
AWAIT_READY(resourceOffers2);
@@ -2138,8 +2138,8 @@ TEST_F(MasterTest, MaxExecutorsPerSlave)
driver.start();
AWAIT_READY(masterInfo);
- EXPECT_EQ(master.get().node.port, masterInfo.get().port());
- EXPECT_EQ(master.get().node.ip, masterInfo.get().ip());
+ EXPECT_EQ(master.get().address.port, masterInfo.get().port());
+ EXPECT_EQ(master.get().address.ip, masterInfo.get().ip());
driver.stop();
driver.join();
http://git-wip-us.apache.org/repos/asf/mesos/blob/4a935124/src/tests/metrics_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/metrics_tests.cpp b/src/tests/metrics_tests.cpp
index 751f82a..3b2dc24 100644
--- a/src/tests/metrics_tests.cpp
+++ b/src/tests/metrics_tests.cpp
@@ -41,7 +41,7 @@ TEST_F(MetricsTest, Master)
ASSERT_SOME(master);
// Get the snapshot.
- process::UPID upid("metrics", process::node());
+ process::UPID upid("metrics", process::address());
process::Future<process::http::Response> response =
process::http::get(upid, "snapshot");
@@ -158,7 +158,7 @@ TEST_F(MetricsTest, Slave)
ASSERT_SOME(slave);
// Get the snapshot.
- process::UPID upid("metrics", process::node());
+ process::UPID upid("metrics", process::address());
process::Future<process::http::Response> response =
process::http::get(upid, "snapshot");
http://git-wip-us.apache.org/repos/asf/mesos/blob/4a935124/src/tests/monitor_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/monitor_tests.cpp b/src/tests/monitor_tests.cpp
index 9946741..b640d89 100644
--- a/src/tests/monitor_tests.cpp
+++ b/src/tests/monitor_tests.cpp
@@ -218,7 +218,7 @@ TEST(MonitorTest, Statistics)
// Now wait for ResouorceMonitorProcess::watch to finish.
process::Clock::settle();
- process::UPID upid("monitor", process::node());
+ process::UPID upid("monitor", process::address());
// Request the statistics, this will ask the isolator.
Future<Response> response = process::http::get(upid, "statistics.json");