You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by ne...@apache.org on 2017/05/23 19:50:29 UTC
[1/2] mesos git commit: Avoid validation of agent re-registration
message if possible.
Repository: mesos
Updated Branches:
refs/heads/1.3.x 50550bb7d -> e9e759aac
Avoid validation of agent re-registration message if possible.
If we already have a re-registration in flight from this agent, we don't
need to validate the re-registration message since it will be dropped
anyway. Agent re-registration is a hot path after master failover,
and validating the re-registration message can be somewhat expensive.
Review: https://reviews.apache.org/r/59458/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/312b4cc5
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/312b4cc5
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/312b4cc5
Branch: refs/heads/1.3.x
Commit: 312b4cc54cede5845dad76cf3b1ce5121848000f
Parents: 50550bb
Author: James Peach <jp...@apache.org>
Authored: Mon May 22 17:53:35 2017 -0700
Committer: Neil Conway <ne...@gmail.com>
Committed: Tue May 23 10:56:12 2017 -0700
----------------------------------------------------------------------
src/master/master.cpp | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/312b4cc5/src/master/master.cpp
----------------------------------------------------------------------
diff --git a/src/master/master.cpp b/src/master/master.cpp
index e5005c6..eecfb85 100644
--- a/src/master/master.cpp
+++ b/src/master/master.cpp
@@ -5687,6 +5687,14 @@ void Master::reregisterSlave(
return;
}
+ if (slaves.reregistering.contains(slaveInfo.id())) {
+ LOG(INFO)
+ << "Ignoring re-register agent message from agent "
+ << slaveInfo.id() << " at " << from << " ("
+ << slaveInfo.hostname() << ") as re-registration is already in progress";
+ return;
+ }
+
Option<Error> error = validation::master::message::reregisterSlave(
slaveInfo, tasks, checkpointedResources, executorInfos, frameworks);
@@ -5697,14 +5705,6 @@ void Master::reregisterSlave(
return;
}
- if (slaves.reregistering.contains(slaveInfo.id())) {
- LOG(INFO)
- << "Ignoring re-register agent message from agent "
- << slaveInfo.id() << " at " << from << " ("
- << slaveInfo.hostname() << ") as re-registration is already in progress";
- return;
- }
-
LOG(INFO) << "Received re-register agent message from agent "
<< slaveInfo.id() << " at " << from << " ("
<< slaveInfo.hostname() << ")";
[2/2] mesos git commit: Added MESOS-7538 to 1.3.0 CHANGELOG.
Posted by ne...@apache.org.
Added MESOS-7538 to 1.3.0 CHANGELOG.
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/e9e759aa
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/e9e759aa
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/e9e759aa
Branch: refs/heads/1.3.x
Commit: e9e759aac0fbab5957d7dae3a6f2d73485085943
Parents: 312b4cc
Author: Neil Conway <ne...@gmail.com>
Authored: Tue May 23 11:25:47 2017 -0700
Committer: Neil Conway <ne...@gmail.com>
Committed: Tue May 23 11:25:47 2017 -0700
----------------------------------------------------------------------
CHANGELOG | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/e9e759aa/CHANGELOG
----------------------------------------------------------------------
diff --git a/CHANGELOG b/CHANGELOG
index 5a81894..5a41e53 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -199,6 +199,7 @@ All Resolved Issues:
* [MESOS-7471] - Provisioner recover should not always assume 'rootfses' dir exists.
* [MESOS-7478] - Pre-1.2.x master does not work with 1.2.x agent.
* [MESOS-7484] - VersionTest.ParseInvalid aborts on Windows.
+ * [MESOS-7538] - Don't validate re-registrations that are going to be dropped.
** Documentation
* [MESOS-7005] - Add executor authentication documentation.