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 2016/02/10 18:58:59 UTC
[1/2] incubator-slider git commit: SLIDER-971 NPE when "slider
resolve" with "--out" (kyungwan nam)
Repository: incubator-slider
Updated Branches:
refs/heads/develop e4ac8ac2c -> 8ae7cd198
SLIDER-971 NPE when "slider resolve" with "--out" (kyungwan nam)
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/eade2578
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/eade2578
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/eade2578
Branch: refs/heads/develop
Commit: eade2578150249ea784b20b4c0d78a51435f0b29
Parents: e4ac8ac
Author: Steve Loughran <st...@apache.org>
Authored: Wed Feb 10 17:54:03 2016 +0000
Committer: Steve Loughran <st...@apache.org>
Committed: Wed Feb 10 17:57:49 2016 +0000
----------------------------------------------------------------------
.../java/org/apache/slider/common/tools/SliderUtils.java | 5 ++++-
.../org/apache/slider/common/tools/TestSliderUtils.java | 9 +++++++++
2 files changed, 13 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/eade2578/slider-core/src/main/java/org/apache/slider/common/tools/SliderUtils.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/common/tools/SliderUtils.java b/slider-core/src/main/java/org/apache/slider/common/tools/SliderUtils.java
index 7277c21..9c0547f 100644
--- a/slider-core/src/main/java/org/apache/slider/common/tools/SliderUtils.java
+++ b/slider-core/src/main/java/org/apache/slider/common/tools/SliderUtils.java
@@ -2139,7 +2139,10 @@ public final class SliderUtils {
*/
public static void write(File outfile, byte[] data, boolean createParent)
throws IOException {
- File parentDir = outfile.getParentFile();
+ File parentDir = outfile.getCanonicalFile().getParentFile();
+ if (parentDir == null) {
+ throw new IOException(outfile.getPath() + " has no parent dir");
+ }
if (createParent) {
parentDir.mkdirs();
}
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/eade2578/slider-core/src/test/java/org/apache/slider/common/tools/TestSliderUtils.java
----------------------------------------------------------------------
diff --git a/slider-core/src/test/java/org/apache/slider/common/tools/TestSliderUtils.java b/slider-core/src/test/java/org/apache/slider/common/tools/TestSliderUtils.java
index 46fe638..20e72c0 100644
--- a/slider-core/src/test/java/org/apache/slider/common/tools/TestSliderUtils.java
+++ b/slider-core/src/test/java/org/apache/slider/common/tools/TestSliderUtils.java
@@ -16,6 +16,7 @@
*/
package org.apache.slider.common.tools;
+import org.apache.commons.io.FileUtils;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
@@ -30,6 +31,8 @@ import org.junit.rules.TemporaryFolder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.io.File;
+import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.List;
@@ -147,4 +150,10 @@ public class TestSliderUtils {
Assert.assertFalse("Should be false", SliderUtils.isHdp());
}
+ @Test
+ public void testWrite() throws IOException {
+ File testWriteFile = folder.newFile("testWrite");
+ SliderUtils.write(testWriteFile, "test".getBytes("UTF-8"), true);
+ Assert.assertTrue(FileUtils.readFileToString(testWriteFile, "UTF-8").equals("test"));
+ }
}
[2/2] incubator-slider git commit: SLIDER-1083 Remove hard coded user
name check for actionDependency (shanyu zhao)
Posted by st...@apache.org.
SLIDER-1083 Remove hard coded user name check for actionDependency (shanyu zhao)
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/8ae7cd19
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/8ae7cd19
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/8ae7cd19
Branch: refs/heads/develop
Commit: 8ae7cd1982a61f6640dc8303e002a660d87a9e36
Parents: eade257
Author: Steve Loughran <st...@apache.org>
Authored: Wed Feb 10 17:58:19 2016 +0000
Committer: Steve Loughran <st...@apache.org>
Committed: Wed Feb 10 17:58:19 2016 +0000
----------------------------------------------------------------------
.../src/main/java/org/apache/slider/client/SliderClient.java | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/8ae7cd19/slider-core/src/main/java/org/apache/slider/client/SliderClient.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/client/SliderClient.java b/slider-core/src/main/java/org/apache/slider/client/SliderClient.java
index ed097b4..113b00e 100644
--- a/slider-core/src/main/java/org/apache/slider/client/SliderClient.java
+++ b/slider-core/src/main/java/org/apache/slider/client/SliderClient.java
@@ -4263,13 +4263,8 @@ public class SliderClient extends AbstractSliderLaunchedService implements RunSe
@Override
public int actionDependency(ActionDependencyArgs args) throws IOException,
YarnException {
- // check to ensure if the current user is hdfs
String currentUser = getUsername();
- String hdfsUser = "hdfs";
- if (!hdfsUser.equalsIgnoreCase(currentUser)) {
- log.error("Please run this command as user {}", hdfsUser);
- return EXIT_FALSE;
- }
+ log.info("Running command as user {}", currentUser);
String version = getSliderVersion();
Path dependencyLibTarGzip = sliderFileSystem.getDependencyTarGzip();