SLIDER-875 fix compilation errors in AgentProviderService
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/937b45b0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/937b45b0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/937b45b0 Branch: refs/heads/develop Commit: 937b45b00dcc24245c6c08d6e60a4ab16d73f580 Parents: 8863393 Author: Billie Rinaldi <billie.rina...@gmail.com> Authored: Wed Aug 10 08:52:47 2016 -0700 Committer: Billie Rinaldi <billie.rina...@gmail.com> Committed: Wed Aug 10 08:52:47 2016 -0700 ---------------------------------------------------------------------- .../providers/agent/AgentProviderService.java | 24 ++++++++++++-------- 1 file changed, 14 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/937b45b0/slider-core/src/main/java/org/apache/slider/providers/agent/AgentProviderService.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/providers/agent/AgentProviderService.java b/slider-core/src/main/java/org/apache/slider/providers/agent/AgentProviderService.java index bc362b5..4d68ba2 100644 --- a/slider-core/src/main/java/org/apache/slider/providers/agent/AgentProviderService.java +++ b/slider-core/src/main/java/org/apache/slider/providers/agent/AgentProviderService.java @@ -492,7 +492,7 @@ public class AgentProviderService extends AbstractProviderService implements LocalResourceType.ARCHIVE); launcher.addLocalResource(AgentKeys.APP_DEFINITION_DIR, appDefRes); - for (Package pkg : getMetaInfo().getApplication().getPackages()) { + for (Package pkg : getMetaInfo(roleGroup).getApplication().getPackages()) { Path pkgPath = fileSystem.buildResourcePath(pkg.getName()); if (!fileSystem.isFile(pkgPath)) { pkgPath = fileSystem.buildResourcePath(getClusterName(), @@ -558,7 +558,7 @@ public class AgentProviderService extends AbstractProviderService implements Map<String, Map<String, String>> configurations = buildCommandConfigurations(instanceDefinition.getAppConfOperations(), container.getId().toString(), roleName, roleGroup); - localizeConfigFiles(launcher, roleName, roleGroup, getMetaInfo(), + localizeConfigFiles(launcher, roleName, roleGroup, getMetaInfo(roleGroup), configurations, launcher.getEnv(), fileSystem); } @@ -1417,7 +1417,8 @@ public class AgentProviderService extends AbstractProviderService implements // identify client component Component client = null; - for (Component component : getMetaInfo().getApplication().getComponents()) { + for (Component component : getMetaInfo(null).getApplication() + .getComponents()) { if (component.getCategory().equals("CLIENT")) { client = component; break; @@ -1447,22 +1448,22 @@ public class AgentProviderService extends AbstractProviderService implements throw new IOException(e); } - for (ConfigFile configFile : getMetaInfo() + for (ConfigFile configFile : getMetaInfo(null) .getComponentConfigFiles(client.getName())) { addNamedConfiguration(configFile.getDictionaryName(), appConf.getGlobalOptions().options, configurations, tokens, null, - client.getName()); + client.getName(), client.getName()); if (appConf.getComponent(client.getName()) != null) { addNamedConfiguration(configFile.getDictionaryName(), appConf.getComponent(client.getName()).options, configurations, - tokens, null, client.getName()); + tokens, null, client.getName(), client.getName()); } } //do a final replacement of re-used configs dereferenceAllConfigs(configurations); - for (ConfigFile configFile : getMetaInfo() + for (ConfigFile configFile : getMetaInfo(null) .getComponentConfigFiles(client.getName())) { ConfigFormat configFormat = ConfigFormat.resolve(configFile.getType()); @@ -1581,9 +1582,12 @@ public class AgentProviderService extends AbstractProviderService implements @VisibleForTesting protected Metainfo getMetaInfo(String roleGroup) { - ConfTreeOperations appConf = getAmState().getAppConfSnapshot(); - String mapKey = appConf.getComponentOpt(roleGroup, ROLE_PREFIX, - DEFAULT_METAINFO_MAP_KEY); + String mapKey = DEFAULT_METAINFO_MAP_KEY; + if (roleGroup != null) { + ConfTreeOperations appConf = getAmState().getAppConfSnapshot(); + mapKey = appConf.getComponentOpt(roleGroup, ROLE_PREFIX, + DEFAULT_METAINFO_MAP_KEY); + } MetainfoHolder mh = this.metaInfoMap.get(mapKey); if (mh == null) { return null;
