Repository: incubator-slider Updated Branches: refs/heads/develop 7a1a590f3 -> aaeac3196
SLIDER-531 re-enable registration of IPC endpoint now that hadoop-2.6 only uses the "2nd generation" registry format Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/ceb21e15 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/ceb21e15 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/ceb21e15 Branch: refs/heads/develop Commit: ceb21e15748df0f66e02c34cb694c32fb6f2a146 Parents: 7a1a590 Author: Steve Loughran <[email protected]> Authored: Wed Jan 7 12:29:05 2015 +0000 Committer: Steve Loughran <[email protected]> Committed: Wed Jan 7 12:29:05 2015 +0000 ---------------------------------------------------------------------- .../org/apache/slider/server/appmaster/SliderAppMaster.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/ceb21e15/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java b/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java index 0dd6c59..7b9f6db 100644 --- a/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java +++ b/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java @@ -34,6 +34,7 @@ import org.apache.hadoop.http.HttpConfig; import org.apache.hadoop.io.DataOutputBuffer; import org.apache.hadoop.io.Text; import org.apache.hadoop.ipc.ProtocolSignature; +import org.apache.hadoop.registry.client.binding.RegistryTypeUtils; import org.apache.hadoop.registry.client.binding.RegistryUtils; import org.apache.hadoop.security.Credentials; import org.apache.hadoop.security.UserGroupInformation; @@ -106,6 +107,7 @@ import org.apache.slider.core.main.LauncherExitCodes; import org.apache.slider.core.main.RunService; import org.apache.slider.core.main.ServiceLauncher; import org.apache.slider.core.persist.ConfTreeSerDeser; +import org.apache.slider.core.registry.info.CustomRegistryConstants; import org.apache.slider.providers.ProviderCompleted; import org.apache.slider.providers.ProviderRole; import org.apache.slider.providers.ProviderService; @@ -1132,15 +1134,11 @@ public class SliderAppMaster extends AbstractSliderLaunchedService PersistencePolicies.APPLICATION); serviceRecord.description = "Slider Application Master"; -/* SLIDER-531: disable this addition so things compile against versions of -the registry with/without the new record format - serviceRecord.addExternalEndpoint( RegistryTypeUtils.ipcEndpoint( CustomRegistryConstants.AM_IPC_PROTOCOL, rpcServiceAddress)); - */ // internal services sliderAMProvider.applyInitialRegistryDefinitions(amWebURI, agentOpsURI,
