aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuis Hector Chavez <lhchavez@google.com>2017-01-31 01:44:35 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-01-31 01:44:35 +0000
commit0a6947d947e8a76a2ed5d9df38367bd7d86331ac (patch)
treeab725ab1710ef3e62ce3f2018e1f0103820d5b4e
parentb75e65296db7fd40fa63b77f596c3f546e3674f7 (diff)
parent62201b13e8b2c40c09af1c45e2903e10bdab1212 (diff)
downloadlibmojo-0a6947d947e8a76a2ed5d9df38367bd7d86331ac.tar.gz
[mojo] Remove an unnecessary hack to avoid a race am: e13d667983 am: dff0a3ca9f
am: 62201b13e8 Change-Id: I714ef47c12b76cea4b8d926ca97e65ee32793af7
-rw-r--r--mojo/edk/system/node_controller.cc17
1 files changed, 0 insertions, 17 deletions
diff --git a/mojo/edk/system/node_controller.cc b/mojo/edk/system/node_controller.cc
index 91599d8..63291a5 100644
--- a/mojo/edk/system/node_controller.cc
+++ b/mojo/edk/system/node_controller.cc
@@ -647,23 +647,6 @@ void NodeController::SendPeerMessage(const ports::NodeName& name,
DVLOG(1) << "Dropping message for unknown peer: " << name;
return;
}
-
- // HACK: On ARC++ we never really need this codepath since it is always hit
- // when RemoteMessagePipeBootstrap races against us in delivering the
- // three-way broker handshake. If we do send the RequestIntroduction message,
- // the broker (Chrome) won't yet know our peer, and it will cause us to drop
- // that peer's connection, causing it to go in loops requesting for a
- // re-introduction. Instead, let's assume that the node will eventually be
- // introduced to us and just stick it in the queue. Note that this is only
- // safe since ARC++ processes strictly follow a star topology, and we never
- // pass handles between children.
- //
- // We need to revert this eventually when a long-term fix is ready. See
- // b/33453258 for more details.
- LOG(ERROR) << "Averted b/33453258 by dropping the introduction request for "
- << name;
- return;
-
broker->RequestIntroduction(name);
}
}