You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by an...@apache.org on 2016/10/28 14:14:07 UTC
[2/3] mesos git commit: Populated `MasterInfo` evolving from v0
framework registered message.
Populated `MasterInfo` evolving from v0 framework registered message.
Review: https://reviews.apache.org/r/53246
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/ae587dcd
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/ae587dcd
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/ae587dcd
Branch: refs/heads/master
Commit: ae587dcd34f056c0ddfdc4864c6a1317325e6aa7
Parents: 7476409
Author: Anand Mazumdar <an...@apache.org>
Authored: Thu Oct 27 15:46:01 2016 -0700
Committer: Anand Mazumdar <an...@apache.org>
Committed: Fri Oct 28 07:12:47 2016 -0700
----------------------------------------------------------------------
src/internal/evolve.cpp | 4 ++++
src/tests/scheduler_tests.cpp | 1 +
2 files changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/ae587dcd/src/internal/evolve.cpp
----------------------------------------------------------------------
diff --git a/src/internal/evolve.cpp b/src/internal/evolve.cpp
index 8d5824f..23a515c 100644
--- a/src/internal/evolve.cpp
+++ b/src/internal/evolve.cpp
@@ -284,6 +284,8 @@ v1::scheduler::Event evolve(const FrameworkRegisteredMessage& message)
subscribed->set_heartbeat_interval_seconds(
master::DEFAULT_HEARTBEAT_INTERVAL.secs());
+ subscribed->mutable_master_info()->CopyFrom(evolve(message.master_info()));
+
return event;
}
@@ -301,6 +303,8 @@ v1::scheduler::Event evolve(const FrameworkReregisteredMessage& message)
subscribed->set_heartbeat_interval_seconds(
master::DEFAULT_HEARTBEAT_INTERVAL.secs());
+ subscribed->mutable_master_info()->CopyFrom(evolve(message.master_info()));
+
return event;
}
http://git-wip-us.apache.org/repos/asf/mesos/blob/ae587dcd/src/tests/scheduler_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/scheduler_tests.cpp b/src/tests/scheduler_tests.cpp
index 6e876a7..5b8ee6b 100644
--- a/src/tests/scheduler_tests.cpp
+++ b/src/tests/scheduler_tests.cpp
@@ -142,6 +142,7 @@ TEST_P(SchedulerTest, Subscribe)
ASSERT_EQ(master::DEFAULT_HEARTBEAT_INTERVAL.secs(),
subscribed->heartbeat_interval_seconds());
+ ASSERT_EQ(evolve(master.get()->getMasterInfo()), subscribed->master_info());
}