You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ar...@apache.org on 2016/08/04 17:32:45 UTC
[1/4] hadoop git commit: HADOOP-13467. Shell#getSignalKillCommand
should use the bash builtin on Linux. (Arpit Agarwal)
Repository: hadoop
Updated Branches:
refs/heads/branch-2 3b2554f3b -> 365a27099
refs/heads/branch-2.8 3a85aea42 -> ad29c9607
refs/heads/trunk 4a8e6dc02 -> b8ca84ac9
HADOOP-13467. Shell#getSignalKillCommand should use the bash builtin on Linux. (Arpit Agarwal)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/b8ca84ac
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/b8ca84ac
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/b8ca84ac
Branch: refs/heads/trunk
Commit: b8ca84ac99d2cb2bfe43930eb9b178ee010e4812
Parents: 4a8e6dc
Author: Arpit Agarwal <ar...@apache.org>
Authored: Thu Aug 4 10:07:53 2016 -0700
Committer: Arpit Agarwal <ar...@apache.org>
Committed: Thu Aug 4 10:07:53 2016 -0700
----------------------------------------------------------------------
.../src/main/java/org/apache/hadoop/util/Shell.java | 11 ++++++++---
.../src/test/java/org/apache/hadoop/util/TestShell.java | 12 ++++++++----
2 files changed, 16 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/b8ca84ac/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/Shell.java
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/Shell.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/Shell.java
index 60f8ff5..7149268 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/Shell.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/Shell.java
@@ -311,11 +311,16 @@ public abstract class Shell {
}
}
+ // Use the bash-builtin instead of the Unix kill command (usually
+ // /bin/kill) as the bash-builtin supports "--" in all Hadoop supported
+ // OSes.
+ final String quotedPid = bashQuote(pid);
if (isSetsidAvailable) {
- // Use the shell-builtin as it support "--" in all Hadoop supported OSes
- return new String[] {"kill", "-" + code, "--", "-" + pid};
+ return new String[] { "bash", "-c", "kill -" + code + " -- -" +
+ quotedPid };
} else {
- return new String[] {"kill", "-" + code, pid };
+ return new String[] { "bash", "-c", "kill -" + code + " " +
+ quotedPid };
}
}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/b8ca84ac/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestShell.java
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestShell.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestShell.java
index acc7f1d..67903f7 100644
--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestShell.java
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestShell.java
@@ -235,9 +235,11 @@ public class TestShell extends Assert {
expectedCommand =
new String[]{getWinUtilsPath(), "task", "isAlive", anyPid };
} else if (Shell.isSetsidAvailable) {
- expectedCommand = new String[] {"kill", "-0", "--", "-" + anyPid };
+ expectedCommand = new String[] { "bash", "-c", "kill -0 -- -'" +
+ anyPid + "'"};
} else {
- expectedCommand = new String[] {"kill", "-0", anyPid };
+ expectedCommand = new String[] {"bash", "-c", "kill -0 '" + anyPid +
+ "'" };
}
Assert.assertArrayEquals(expectedCommand, checkProcessAliveCommand);
}
@@ -255,9 +257,11 @@ public class TestShell extends Assert {
expectedCommand =
new String[]{getWinUtilsPath(), "task", "kill", anyPid };
} else if (Shell.isSetsidAvailable) {
- expectedCommand = new String[] {"kill", "-9", "--", "-" + anyPid };
+ expectedCommand = new String[] { "bash", "-c", "kill -9 -- -'" + anyPid +
+ "'"};
} else {
- expectedCommand = new String[] {"kill", "-9", anyPid };
+ expectedCommand = new String[]{ "bash", "-c", "kill -9 '" + anyPid +
+ "'"};
}
Assert.assertArrayEquals(expectedCommand, checkProcessAliveCommand);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[2/4] hadoop git commit: HADOOP-13467. Shell#getSignalKillCommand
should use the bash builtin on Linux. (Arpit Agarwal)
Posted by ar...@apache.org.
HADOOP-13467. Shell#getSignalKillCommand should use the bash builtin on Linux. (Arpit Agarwal)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/365a2709
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/365a2709
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/365a2709
Branch: refs/heads/branch-2
Commit: 365a27099c5f2ea273368df7e899650d10fc5c99
Parents: 3b2554f
Author: Arpit Agarwal <ar...@apache.org>
Authored: Thu Aug 4 10:07:53 2016 -0700
Committer: Arpit Agarwal <ar...@apache.org>
Committed: Thu Aug 4 10:08:23 2016 -0700
----------------------------------------------------------------------
.../src/main/java/org/apache/hadoop/util/Shell.java | 11 ++++++++---
.../src/test/java/org/apache/hadoop/util/TestShell.java | 12 ++++++++----
2 files changed, 16 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/365a2709/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/Shell.java
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/Shell.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/Shell.java
index 3007d32..0311a1e 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/Shell.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/Shell.java
@@ -311,11 +311,16 @@ public abstract class Shell {
}
}
+ // Use the bash-builtin instead of the Unix kill command (usually
+ // /bin/kill) as the bash-builtin supports "--" in all Hadoop supported
+ // OSes.
+ final String quotedPid = bashQuote(pid);
if (isSetsidAvailable) {
- // Use the shell-builtin as it support "--" in all Hadoop supported OSes
- return new String[] {"kill", "-" + code, "--", "-" + pid};
+ return new String[] { "bash", "-c", "kill -" + code + " -- -" +
+ quotedPid };
} else {
- return new String[] {"kill", "-" + code, pid };
+ return new String[] { "bash", "-c", "kill -" + code + " " +
+ quotedPid };
}
}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/365a2709/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestShell.java
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestShell.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestShell.java
index c0491fac..3ef6fb1 100644
--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestShell.java
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestShell.java
@@ -240,9 +240,11 @@ public class TestShell extends Assert {
expectedCommand =
new String[]{getWinUtilsPath(), "task", "isAlive", anyPid };
} else if (Shell.isSetsidAvailable) {
- expectedCommand = new String[] {"kill", "-0", "--", "-" + anyPid };
+ expectedCommand = new String[] { "bash", "-c", "kill -0 -- -'" +
+ anyPid + "'"};
} else {
- expectedCommand = new String[] {"kill", "-0", anyPid };
+ expectedCommand = new String[] {"bash", "-c", "kill -0 '" + anyPid +
+ "'" };
}
Assert.assertArrayEquals(expectedCommand, checkProcessAliveCommand);
}
@@ -260,9 +262,11 @@ public class TestShell extends Assert {
expectedCommand =
new String[]{getWinUtilsPath(), "task", "kill", anyPid };
} else if (Shell.isSetsidAvailable) {
- expectedCommand = new String[] {"kill", "-9", "--", "-" + anyPid };
+ expectedCommand = new String[] { "bash", "-c", "kill -9 -- -'" + anyPid +
+ "'"};
} else {
- expectedCommand = new String[] {"kill", "-9", anyPid };
+ expectedCommand = new String[]{ "bash", "-c", "kill -9 '" + anyPid +
+ "'"};
}
Assert.assertArrayEquals(expectedCommand, checkProcessAliveCommand);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[4/4] hadoop git commit: HADOOP-13467. Shell#getSignalKillCommand
should use the bash builtin on Linux. (Arpit Agarwal)
Posted by ar...@apache.org.
HADOOP-13467. Shell#getSignalKillCommand should use the bash builtin on Linux. (Arpit Agarwal)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/ad29c960
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/ad29c960
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/ad29c960
Branch: refs/heads/branch-2.8
Commit: ad29c96075e2ffade793efdb667498bf2b59eef3
Parents: f3424d6
Author: Arpit Agarwal <ar...@apache.org>
Authored: Thu Aug 4 10:07:53 2016 -0700
Committer: Arpit Agarwal <ar...@apache.org>
Committed: Thu Aug 4 10:28:55 2016 -0700
----------------------------------------------------------------------
.../src/main/java/org/apache/hadoop/util/Shell.java | 11 ++++++++---
.../src/test/java/org/apache/hadoop/util/TestShell.java | 12 ++++++++----
2 files changed, 16 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/ad29c960/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/Shell.java
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/Shell.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/Shell.java
index 6c74601..f98fbf9 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/Shell.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/Shell.java
@@ -311,11 +311,16 @@ public abstract class Shell {
}
}
+ // Use the bash-builtin instead of the Unix kill command (usually
+ // /bin/kill) as the bash-builtin supports "--" in all Hadoop supported
+ // OSes.
+ final String quotedPid = bashQuote(pid);
if (isSetsidAvailable) {
- // Use the shell-builtin as it support "--" in all Hadoop supported OSes
- return new String[] {"kill", "-" + code, "--", "-" + pid};
+ return new String[] { "bash", "-c", "kill -" + code + " -- -" +
+ quotedPid };
} else {
- return new String[] {"kill", "-" + code, pid };
+ return new String[] { "bash", "-c", "kill -" + code + " " +
+ quotedPid };
}
}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/ad29c960/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestShell.java
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestShell.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestShell.java
index be7b332..c5b4bc2 100644
--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestShell.java
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestShell.java
@@ -238,9 +238,11 @@ public class TestShell extends Assert {
expectedCommand =
new String[]{getWinUtilsPath(), "task", "isAlive", anyPid };
} else if (Shell.isSetsidAvailable) {
- expectedCommand = new String[] {"kill", "-0", "--", "-" + anyPid };
+ expectedCommand = new String[] { "bash", "-c", "kill -0 -- -'" +
+ anyPid + "'"};
} else {
- expectedCommand = new String[] {"kill", "-0", anyPid };
+ expectedCommand = new String[] {"bash", "-c", "kill -0 '" + anyPid +
+ "'" };
}
Assert.assertArrayEquals(expectedCommand, checkProcessAliveCommand);
}
@@ -258,9 +260,11 @@ public class TestShell extends Assert {
expectedCommand =
new String[]{getWinUtilsPath(), "task", "kill", anyPid };
} else if (Shell.isSetsidAvailable) {
- expectedCommand = new String[] {"kill", "-9", "--", "-" + anyPid };
+ expectedCommand = new String[] { "bash", "-c", "kill -9 -- -'" + anyPid +
+ "'"};
} else {
- expectedCommand = new String[] {"kill", "-9", anyPid };
+ expectedCommand = new String[]{ "bash", "-c", "kill -9 '" + anyPid +
+ "'"};
}
Assert.assertArrayEquals(expectedCommand, checkProcessAliveCommand);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[3/4] hadoop git commit: HDFS-10722. Fix build break.
Posted by ar...@apache.org.
HDFS-10722. Fix build break.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/f3424d66
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/f3424d66
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/f3424d66
Branch: refs/heads/branch-2.8
Commit: f3424d662a662dd7148c5aa8bb59be2e558afa0c
Parents: 3a85aea
Author: Arpit Agarwal <ar...@apache.org>
Authored: Thu Aug 4 10:28:43 2016 -0700
Committer: Arpit Agarwal <ar...@apache.org>
Committed: Thu Aug 4 10:28:43 2016 -0700
----------------------------------------------------------------------
.../org/apache/hadoop/hdfs/server/namenode/TestEditLog.java | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/f3424d66/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestEditLog.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestEditLog.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestEditLog.java
index 92477ac..226f395 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestEditLog.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestEditLog.java
@@ -562,12 +562,8 @@ public class TestEditLog {
// Log an edit from thread A
doLogEdit(threadA, editLog, "thread-a 1");
- // async log is doing batched syncs in background. logSync just ensures
- // the edit is durable, so the txid may increase prior to sync
- if (!useAsyncEditLog) {
- assertEquals("logging edit without syncing should do not affect txid",
- 1, editLog.getSyncTxId());
- }
+ assertEquals("logging edit without syncing should do not affect txid",
+ 1, editLog.getSyncTxId());
// logSyncAll in Thread B
doCallLogSyncAll(threadB, editLog);
assertEquals("logSyncAll should sync thread A's transaction",
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org