You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@slider.apache.org by st...@apache.org on 2014/05/08 18:15:36 UTC
svn commit: r1593316 -
/incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/client/SliderClient.java
Author: stevel
Date: Thu May 8 16:15:35 2014
New Revision: 1593316
URL: http://svn.apache.org/r1593316
Log:
SLIDER-39 use providerName string to set provider in internal.json
Modified:
incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/client/SliderClient.java
Modified: incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/client/SliderClient.java
URL: http://svn.apache.org/viewvc/incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/client/SliderClient.java?rev=1593316&r1=1593315&r2=1593316&view=diff
==============================================================================
--- incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/client/SliderClient.java (original)
+++ incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/client/SliderClient.java Thu May 8 16:15:35 2014
@@ -384,9 +384,6 @@ public class SliderClient extends Abstra
getConfig(),
clustername);
-
-
-
AggregateConf instanceDefinition = new AggregateConf();
ConfTreeOperations appConf = instanceDefinition.getAppConfOperations();
ConfTreeOperations resources = instanceDefinition.getResourceOperations();
@@ -459,7 +456,7 @@ public class SliderClient extends Abstra
appConf.merge(cmdLineResourceOptions);
resources.mergeComponents(buildInfo.getResourceCompOptionMap());
- builder.init(provider.getName(), instanceDefinition);
+ builder.init(providerName, instanceDefinition);
builder.propagateFilename();
builder.propagatePrincipals();
builder.setImageDetails(buildInfo.getImage(), buildInfo.getAppHomeDir());
@@ -508,7 +505,6 @@ public class SliderClient extends Abstra
throw new BadClusterStateException("Failed to save " + clustername
+ ": " + e);
}
-
}
public FsPermission getClusterDirectoryPermissions(Configuration conf) {