fix npe when no public address for MarathonTaskLocation.targetMachine #265
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
| @@ -149,7 +150,7 @@ public HostAndPort openPortForwarding(HasNetworkAddresses targetMachine, int tar | |||
| publicSide = HostAndPort.fromParts(marathonHostname, targetPort); | |||
| } | |||
| pfw.associate(marathonHostname, publicSide, (Location) targetMachine, targetPort); | |||
| portmap.put(publicSide, HostAndPort.fromParts(targetMachine.getHostname(), targetPort)); | |||
| portmap.put(publicSide, HostAndPort.fromParts(((MarathonTaskLocation) targetMachine).getSubnetHostname(), targetPort)); | |||
There was a problem hiding this comment.
Maybe do something like:
MarathonTaskLocation location = (MarathonTaskLocation) targetMachine;
pfw.associate(marathonHostname, publicSide, targetMachine, targetPort);
String hostname = Optional.fromNullable(location.getHostname()).or(location.getSubnetHostname());
portmap.put(publicSide, HostAndPort.fromParts(hostname, targetPort));
|
@johnmccabe @aledsage Are you sure this is right? |
grkvlt
added a commit
that referenced
this pull request
Apr 2, 2016
…ase/1.1.x * 'master' of github.com:brooklyncentral/clocker: Update Brooklyn to 0.10.0-SNAPSHOT Mesos: fix rebind, and don’t include “unmanaged” tasks DockerUtils: fix deprecated use of addEnricher Mesos: avoid duplicate sensor-changed events Marathon NPE for private host: address PR #265 Fix DockerHost failing if local certs-dir not existing fix npe when no public address for MarathonTaskLocation.targetMachine MesosFramework.scanTasks: add TODO about race MarathonTask: better handle unmanaged tasks Minor logging improvements Mesos: not “onfire” if just task/app onfire Mesos: fix rebind Conflicts: jsgui/src/main/webapp/index.html
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.
Fixes the issue raised in #264, have tested in Blue Box VPN in both a publically accessible cluster and one accessible only via VPN.
@grkvlt I don't have a solid grasp on the handling of hostnames in this case so suspect this may be too simplistic a fix.