From 092d0602c21d9d981fd77c6f66c71d2f4da6f7ce Mon Sep 17 00:00:00 2001 From: Andrew Wang Date: Mon, 5 Dec 2016 23:18:18 -0800 Subject: [PATCH] HADOOP-13861. Spelling errors in logging and exceptions for code. Contributed by Grant Sohn. (cherry picked from commit 7b988e88992528a0cac2ca8893652c5d4a90c6b9) Conflicts: hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/erasurecode/rawcoder/util/GF256.java hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/KDiag.java (cherry picked from commit 6bd600eef2f4a2ab1515947bd4e909c9954d6acf) --- .../security/authentication/util/ZKSignerSecretProvider.java | 2 +- .../src/main/java/org/apache/hadoop/fs/LocalDirAllocator.java | 2 +- .../main/java/org/apache/hadoop/fs/shell/CommandFormat.java | 2 +- .../src/main/java/org/apache/hadoop/io/file/tfile/TFile.java | 2 +- .../src/main/java/org/apache/hadoop/io/file/tfile/Utils.java | 2 +- .../src/main/java/org/apache/hadoop/net/NetworkTopology.java | 4 ++-- .../hadoop/security/alias/LocalJavaKeyStoreProvider.java | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/util/ZKSignerSecretProvider.java b/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/util/ZKSignerSecretProvider.java index 1d16b2d6bda..48dfaaaf204 100644 --- a/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/util/ZKSignerSecretProvider.java +++ b/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/util/ZKSignerSecretProvider.java @@ -258,7 +258,7 @@ public class ZKSignerSecretProvider extends RolloverSignerSecretProvider { } catch (KeeperException.BadVersionException bve) { LOG.debug("Unable to push to znode; another server already did it"); } catch (Exception ex) { - LOG.error("An unexpected exception occured pushing data to ZooKeeper", + LOG.error("An unexpected exception occurred pushing data to ZooKeeper", ex); } } diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/LocalDirAllocator.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/LocalDirAllocator.java index b14e1f06319..1ed01ea07ff 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/LocalDirAllocator.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/LocalDirAllocator.java @@ -525,7 +525,7 @@ public class LocalDirAllocator { try { advance(); } catch (IOException ie) { - throw new RuntimeException("Can't check existance of " + next, ie); + throw new RuntimeException("Can't check existence of " + next, ie); } if (result == null) { throw new NoSuchElementException(); diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/CommandFormat.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/CommandFormat.java index c2622312318..6a9cdfd75d6 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/CommandFormat.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/CommandFormat.java @@ -248,7 +248,7 @@ public class CommandFormat { private static final long serialVersionUID = 0L; public DuplicatedOptionException(String duplicatedOption) { - super("option " + duplicatedOption + " already exsits!"); + super("option " + duplicatedOption + " already exists!"); } } } diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/file/tfile/TFile.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/file/tfile/TFile.java index f17be1ab90d..56739c6c7e0 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/file/tfile/TFile.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/file/tfile/TFile.java @@ -1789,7 +1789,7 @@ public class TFile { public int getKey(byte[] buf, int offset) throws IOException { if ((offset | (buf.length - offset - klen)) < 0) { throw new IndexOutOfBoundsException( - "Bufer not enough to store the key"); + "Buffer not enough to store the key"); } System.arraycopy(keyBuffer, 0, buf, offset, klen); return klen; diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/file/tfile/Utils.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/file/tfile/Utils.java index 12148efa348..5743c667984 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/file/tfile/Utils.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/file/tfile/Utils.java @@ -153,7 +153,7 @@ public final class Utils { out.writeLong(n); return; default: - throw new RuntimeException("Internel error"); + throw new RuntimeException("Internal error"); } } diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/NetworkTopology.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/NetworkTopology.java index 91c47848795..fde087b75e3 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/NetworkTopology.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/NetworkTopology.java @@ -169,7 +169,7 @@ public class NetworkTopology { if (!isAncestor(n)) { throw new IllegalArgumentException(n.getName() + ", which is located at " + n.getNetworkLocation() - + ", is not a descendent of " + getPath(this)); + + ", is not a descendant of " + getPath(this)); } if (isParent(n)) { // this node is the parent of n; add n directly @@ -231,7 +231,7 @@ public class NetworkTopology { if (!isAncestor(n)) { throw new IllegalArgumentException(n.getName() + ", which is located at " + n.getNetworkLocation() - + ", is not a descendent of " + getPath(this)); + + ", is not a descendant of " + getPath(this)); } if (isParent(n)) { // this node is the parent of n; remove n directly diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/alias/LocalJavaKeyStoreProvider.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/alias/LocalJavaKeyStoreProvider.java index 1891cd33bc2..9ea9a579655 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/alias/LocalJavaKeyStoreProvider.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/alias/LocalJavaKeyStoreProvider.java @@ -151,7 +151,7 @@ public final class LocalJavaKeyStoreProvider extends public void flush() throws IOException { super.flush(); if (LOG.isDebugEnabled()) { - LOG.debug("Reseting permissions to '" + permissions + "'"); + LOG.debug("Resetting permissions to '" + permissions + "'"); } if (!Shell.WINDOWS) { Files.setPosixFilePermissions(Paths.get(file.getCanonicalPath()),