support custom IP address from rpc server to tracker (PUT) #1243
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
tqchen
approved these changes
Jun 7, 2018
|
need rebase from master |
tqchen
requested changes
Jun 7, 2018
python/tvm/contrib/rpc/server.py
Outdated
| @@ -92,8 +91,12 @@ def _accept_conn(listen_sock, tracker_conn, ping_period=2): | |||
| # Report resource to tracker | |||
| if tracker_conn: | |||
| matchkey = base.random_key(rpc_key + ":") | |||
| base.sendjson(tracker_conn, | |||
| [TrackerCode.PUT, rpc_key, (port, matchkey)]) | |||
| if custom_addr is not None: | |||
There was a problem hiding this comment.
Since we will be breaking the RPC protocol anyway in this cycle, maybe just always send the custom_addr
tqchen
requested changes
Jun 7, 2018
| self._tracker.put(key, (self, self._addr[0], port, matchkey)) | ||
| # got custom address (from rpc server) | ||
| if args[3] is not None: | ||
| self._tracker.put(key, (self, args[3], port, matchkey)) |
There was a problem hiding this comment.
can we directly also put None in here?
tqchen
requested changes
Jun 7, 2018
python/tvm/contrib/rpc/tracker.py
Outdated
| @@ -195,6 +195,9 @@ def call_handler(self, args): | |||
| port, matchkey = args[2] | |||
| self.pending_matchkeys.add(matchkey) | |||
| self._tracker.put(key, (self, self._addr[0], port, matchkey)) | |||
| # got custom address (from rpc server) | |||
| if args[3] is not None: | |||
There was a problem hiding this comment.
sorry, seems previous if else way is correct
tqchen
approved these changes
Jun 8, 2018
tqchen
pushed a commit
to tqchen/tvm
that referenced
this pull request
Jul 6, 2018
mnuyens
pushed a commit
to mnuyens/tvm
that referenced
this pull request
Jul 10, 2018
sergei-mironov
pushed a commit
to sergei-mironov/tvm
that referenced
this pull request
Aug 8, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Currently the tracker uses the IP address of the connection when a new rpc server registers.
In the case of a network topology where the tracker is behind a NAT/firewall, the registering RPC server's connection will appear to come from another device from within the NAT (e.g., if we use an ssh tunnel).
This PR allows the registering RPC server to specify a custom IP at
PUTtime so RPC requests to the tracker can receive the actual address of the server.