HADOOP-13861. Spelling errors in logging and exceptions for code. Contributed by Grant Sohn.

(cherry picked from commit 7b988e8899)

 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
This commit is contained in:
Andrew Wang 2016-12-05 23:18:18 -08:00
parent 6a2f239d9e
commit 6bd600eef2
7 changed files with 8 additions and 8 deletions

View File

@ -258,7 +258,7 @@ private synchronized void pushToZK(byte[] newSecret, byte[] currentSecret,
} catch (KeeperException.BadVersionException bve) { } catch (KeeperException.BadVersionException bve) {
LOG.debug("Unable to push to znode; another server already did it"); LOG.debug("Unable to push to znode; another server already did it");
} catch (Exception ex) { } catch (Exception ex) {
LOG.error("An unexpected exception occured pushing data to ZooKeeper", LOG.error("An unexpected exception occurred pushing data to ZooKeeper",
ex); ex);
} }
} }

View File

@ -525,7 +525,7 @@ public Path next() {
try { try {
advance(); advance();
} catch (IOException ie) { } 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) { if (result == null) {
throw new NoSuchElementException(); throw new NoSuchElementException();

View File

@ -248,7 +248,7 @@ public static class DuplicatedOptionException extends IllegalArgumentException {
private static final long serialVersionUID = 0L; private static final long serialVersionUID = 0L;
public DuplicatedOptionException(String duplicatedOption) { public DuplicatedOptionException(String duplicatedOption) {
super("option " + duplicatedOption + " already exsits!"); super("option " + duplicatedOption + " already exists!");
} }
} }
} }

View File

@ -1789,7 +1789,7 @@ public int getKey(byte[] buf) throws IOException {
public int getKey(byte[] buf, int offset) throws IOException { public int getKey(byte[] buf, int offset) throws IOException {
if ((offset | (buf.length - offset - klen)) < 0) { if ((offset | (buf.length - offset - klen)) < 0) {
throw new IndexOutOfBoundsException( throw new IndexOutOfBoundsException(
"Bufer not enough to store the key"); "Buffer not enough to store the key");
} }
System.arraycopy(keyBuffer, 0, buf, offset, klen); System.arraycopy(keyBuffer, 0, buf, offset, klen);
return klen; return klen;

View File

@ -153,7 +153,7 @@ public static void writeVLong(DataOutput out, long n) throws IOException {
out.writeLong(n); out.writeLong(n);
return; return;
default: default:
throw new RuntimeException("Internel error"); throw new RuntimeException("Internal error");
} }
} }

View File

@ -169,7 +169,7 @@ boolean add(Node n) {
if (!isAncestor(n)) { if (!isAncestor(n)) {
throw new IllegalArgumentException(n.getName() throw new IllegalArgumentException(n.getName()
+ ", which is located at " + n.getNetworkLocation() + ", which is located at " + n.getNetworkLocation()
+ ", is not a descendent of " + getPath(this)); + ", is not a descendant of " + getPath(this));
} }
if (isParent(n)) { if (isParent(n)) {
// this node is the parent of n; add n directly // this node is the parent of n; add n directly
@ -231,7 +231,7 @@ boolean remove(Node n) {
if (!isAncestor(n)) { if (!isAncestor(n)) {
throw new IllegalArgumentException(n.getName() throw new IllegalArgumentException(n.getName()
+ ", which is located at " + n.getNetworkLocation() + ", which is located at " + n.getNetworkLocation()
+ ", is not a descendent of " + getPath(this)); + ", is not a descendant of " + getPath(this));
} }
if (isParent(n)) { if (isParent(n)) {
// this node is the parent of n; remove n directly // this node is the parent of n; remove n directly

View File

@ -151,7 +151,7 @@ protected void initFileSystem(URI uri)
public void flush() throws IOException { public void flush() throws IOException {
super.flush(); super.flush();
if (LOG.isDebugEnabled()) { if (LOG.isDebugEnabled()) {
LOG.debug("Reseting permissions to '" + permissions + "'"); LOG.debug("Resetting permissions to '" + permissions + "'");
} }
if (!Shell.WINDOWS) { if (!Shell.WINDOWS) {
Files.setPosixFilePermissions(Paths.get(file.getCanonicalPath()), Files.setPosixFilePermissions(Paths.get(file.getCanonicalPath()),