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 aw...@apache.org on 2016/08/26 20:35:39 UTC

[35/52] [abbrv] hadoop git commit: MAPREDUCE-6767. TestSlive fails after a common change. Contributed by Daniel Templeton.

MAPREDUCE-6767. TestSlive fails after a common change. Contributed by Daniel Templeton.


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/5a6fc5f4
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/5a6fc5f4
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/5a6fc5f4

Branch: refs/heads/HADOOP-13341
Commit: 5a6fc5f4831d130d9bdaca03f02f0ac4e7cfd64f
Parents: a1f3293
Author: Akira Ajisaka <aa...@apache.org>
Authored: Thu Aug 25 10:55:00 2016 +0900
Committer: Akira Ajisaka <aa...@apache.org>
Committed: Thu Aug 25 10:55:00 2016 +0900

----------------------------------------------------------------------
 .../src/test/java/org/apache/hadoop/fs/slive/AppendOp.java         | 2 +-
 .../src/test/java/org/apache/hadoop/fs/slive/TruncateOp.java       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/5a6fc5f4/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/slive/AppendOp.java
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/slive/AppendOp.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/slive/AppendOp.java
index 3d9ba1e..82d221f 100644
--- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/slive/AppendOp.java
+++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/slive/AppendOp.java
@@ -101,7 +101,7 @@ class AppendOp extends Operation {
       out.add(new OperationOutput(OutputType.LONG, getType(),
           ReportWriter.NOT_FOUND, 1L));
       LOG.warn("Error with appending", e);
-    } catch (IOException e) {
+    } catch (IOException | UnsupportedOperationException e) {
       out.add(new OperationOutput(OutputType.LONG, getType(),
           ReportWriter.FAILURES, 1L));
       LOG.warn("Error with appending", e);

http://git-wip-us.apache.org/repos/asf/hadoop/blob/5a6fc5f4/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/slive/TruncateOp.java
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/slive/TruncateOp.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/slive/TruncateOp.java
index c845ac1..202d807 100644
--- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/slive/TruncateOp.java
+++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/slive/TruncateOp.java
@@ -94,7 +94,7 @@ class TruncateOp extends Operation {
       out.add(new OperationOutput(OutputType.LONG, getType(),
           ReportWriter.NOT_FOUND, 1L));
       LOG.warn("Error with truncating", e);
-    } catch (IOException e) {
+    } catch (IOException | UnsupportedOperationException e) {
       out.add(new OperationOutput(OutputType.LONG, getType(),
           ReportWriter.FAILURES, 1L));
       LOG.warn("Error with truncating", e);


---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org