From c7ac518d6c952a8dac851f924698395c548931fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E5=88=9A=E5=AD=A6?= Date: Sat, 29 Sep 2018 10:15:09 +0800 Subject: [PATCH 1/2] misspelled words.[occured -> occurred] --- .../test/java/org/apache/hadoop/hbase/chaos/util/Monkeys.java | 4 ++-- .../java/org/apache/hadoop/hbase/rest/ScannerResource.java | 2 +- .../hbase/regionserver/handler/AssignRegionHandler.java | 2 +- .../hbase/regionserver/handler/UnassignRegionHandler.java | 2 +- .../hadoop/hbase/regionserver/wal/CombinedAsyncWriter.java | 2 +- .../apache/hadoop/hbase/security/access/AccessChecker.java | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/util/Monkeys.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/util/Monkeys.java index 8ad241adf0d7..acdd7b083757 100644 --- a/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/util/Monkeys.java +++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/util/Monkeys.java @@ -55,7 +55,7 @@ public Monkeys(Configuration conf) { try { monkeyRunner.getAndStartMonkey(); } catch (Exception e) { - LOG.error("Exception occured when running chaos monkeys: ", e); + LOG.error("Exception occurred when running chaos monkeys: ", e); } }; this.executor = Executors.newSingleThreadExecutor(new ThreadFactoryBuilder() @@ -91,7 +91,7 @@ public void close() throws IOException { executor.awaitTermination(10, TimeUnit.SECONDS); } catch (InterruptedException e) { Thread.currentThread().interrupt(); - LOG.warn("Interruption occured while stopping chaos monkeys " + e); + LOG.warn("Interruption occurred while stopping chaos monkeys " + e); } } } diff --git a/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/ScannerResource.java b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/ScannerResource.java index 9de033de1c5e..cd1bc4d76fb6 100644 --- a/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/ScannerResource.java +++ b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/ScannerResource.java @@ -112,7 +112,7 @@ Response update(final ScannerModel model, final boolean replace, servlet.getMetrics().incrementSucessfulPutRequests(1); return Response.created(uri).build(); } catch (Exception e) { - LOG.error("Exception occured while processing " + uriInfo.getAbsolutePath() + " : ", e); + LOG.error("Exception occurred while processing " + uriInfo.getAbsolutePath() + " : ", e); servlet.getMetrics().incrementFailedPutRequests(1); if (e instanceof TableNotFoundException) { return Response.status(Response.Status.NOT_FOUND) diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/handler/AssignRegionHandler.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/handler/AssignRegionHandler.java index c6fee2e57ae1..2a387fcc3e3d 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/handler/AssignRegionHandler.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/handler/AssignRegionHandler.java @@ -149,7 +149,7 @@ public void process() throws IOException { @Override protected void handleException(Throwable t) { - LOG.warn("Fatal error occured while opening region {}, aborting...", + LOG.warn("Fatal error occurred while opening region {}, aborting...", regionInfo.getRegionNameAsString(), t); getServer().abort( "Failed to open region " + regionInfo.getRegionNameAsString() + " and can not recover", t); diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/handler/UnassignRegionHandler.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/handler/UnassignRegionHandler.java index cd38db14c7d6..a7d4ef3349a0 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/handler/UnassignRegionHandler.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/handler/UnassignRegionHandler.java @@ -126,7 +126,7 @@ public void process() throws IOException { @Override protected void handleException(Throwable t) { - LOG.warn("Fatal error occured while closing region {}, aborting...", encodedName, t); + LOG.warn("Fatal error occurred while closing region {}, aborting...", encodedName, t); getServer().abort("Failed to close region " + encodedName + " and can not recover", t); } diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/CombinedAsyncWriter.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/CombinedAsyncWriter.java index 4301ae793594..7b4db4b86e13 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/CombinedAsyncWriter.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/CombinedAsyncWriter.java @@ -62,7 +62,7 @@ public void close() throws IOException { } if (error != null) { throw new IOException("Failed to close at least one writer, please see the warn log above. " + - "The cause is the first exception occured", error); + "The cause is the first exception occurred", error); } } diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/AccessChecker.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/AccessChecker.java index c31658fd497e..69944029148c 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/AccessChecker.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/AccessChecker.java @@ -479,7 +479,7 @@ public static List getUserGroups(String user) { try { return groupService.getGroups(user); } catch (IOException e) { - LOG.error("Error occured while retrieving group for " + user, e); + LOG.error("Error occurred while retrieving group for " + user, e); return new ArrayList(); } } From dbcceeace797bc9d6af6874607bcbb6596ed2e6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E5=88=9A=E5=AD=A6?= Date: Sat, 29 Sep 2018 10:15:09 +0800 Subject: [PATCH 2/2] misspelled words.[occured -> occurred] (cherry picked from commit c7ac518d6c952a8dac851f924698395c548931fc) --- .../org/apache/hadoop/hbase/security/access/AccessChecker.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/AccessChecker.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/AccessChecker.java index c4957f982d22..9ed5b522cba5 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/AccessChecker.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/AccessChecker.java @@ -522,7 +522,7 @@ public static List getUserGroups(String user) { try { return groupService.getGroups(user); } catch (IOException e) { - LOG.error("Error occured while retrieving group for " + user, e); + LOG.error("Error occurred while retrieving group for " + user, e); return new ArrayList<>(); } }