Repository: hadoop
Updated Branches:
refs/heads/branch-2.8 1a7b2ab9b -> 092d0602c
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)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/092d0602
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/092d0602
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/092d0602
Branch: refs/heads/branch-2.8
Commit: 092d0602c21d9d981fd77c6f66c71d2f4da6f7ce
Parents: 1a7b2ab
Author: Andrew Wang <[email protected]>
Authored: Mon Dec 5 23:18:18 2016 -0800
Committer: Andrew Wang <[email protected]>
Committed: Mon Dec 5 23:21:17 2016 -0800
----------------------------------------------------------------------
.../security/authentication/util/ZKSignerSecretProvider.java | 2 +-
.../src/main/java/org/apache/hadoop/fs/LocalDirAllocator.java | 2 +-
.../src/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 ++--
.../apache/hadoop/security/alias/LocalJavaKeyStoreProvider.java | 2 +-
7 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/092d0602/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/util/ZKSignerSecretProvider.java
----------------------------------------------------------------------
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 1d16b2d..48dfaaa 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);
}
}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/092d0602/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/LocalDirAllocator.java
----------------------------------------------------------------------
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 b14e1f0..1ed01ea 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();
http://git-wip-us.apache.org/repos/asf/hadoop/blob/092d0602/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/CommandFormat.java
----------------------------------------------------------------------
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 c262231..6a9cdfd 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!");
}
}
}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/092d0602/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/file/tfile/TFile.java
----------------------------------------------------------------------
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 f17be1a..56739c6 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;
http://git-wip-us.apache.org/repos/asf/hadoop/blob/092d0602/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/file/tfile/Utils.java
----------------------------------------------------------------------
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 12148ef..5743c66 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");
}
}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/092d0602/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/NetworkTopology.java
----------------------------------------------------------------------
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 91c4784..fde087b 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
http://git-wip-us.apache.org/repos/asf/hadoop/blob/092d0602/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/alias/LocalJavaKeyStoreProvider.java
----------------------------------------------------------------------
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 1891cd3..9ea9a57 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()),
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
