You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by bh...@apache.org on 2014/02/03 23:38:52 UTC
[01/12] git commit: Revert "ACCUMULO-2312 test was expecting overly
wrapped errors"
Updated Branches:
refs/heads/1.4.5-SNAPSHOT 748276b5b -> f11eb1db9
refs/heads/1.5.1-SNAPSHOT 09ce8144e -> d06a9ef79
refs/heads/1.6.0-SNAPSHOT 450a653da -> 5117947c4
refs/heads/master 4879e7cca -> e9fe02266
Revert "ACCUMULO-2312 test was expecting overly wrapped errors"
This reverts commit 722d6be1d05cdafac17a424c5e91bc166d622231.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/44eb7d4f
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/44eb7d4f
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/44eb7d4f
Branch: refs/heads/master
Commit: 44eb7d4f284a6e4b2daf39be966cd4e29cce70f2
Parents: 722d6be
Author: John Vines <vi...@apache.org>
Authored: Mon Feb 3 15:25:29 2014 -0500
Committer: John Vines <vi...@apache.org>
Committed: Mon Feb 3 15:25:29 2014 -0500
----------------------------------------------------------------------
.../accumulo/test/randomwalk/concurrent/ChangePermissions.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/44eb7d4f/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/ChangePermissions.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/ChangePermissions.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/ChangePermissions.java
index 6b3acb6..63af95a 100644
--- a/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/ChangePermissions.java
+++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/ChangePermissions.java
@@ -66,9 +66,9 @@ public class ChangePermissions extends Test {
} catch (AccumuloException ex) {
Throwable cause = ex.getCause();
if (cause != null && cause instanceof ThriftTableOperationException) {
- ThriftTableOperationException toe = (ThriftTableOperationException)cause;
+ ThriftTableOperationException toe = (ThriftTableOperationException)cause.getCause();
if (toe.type == TableOperationExceptionType.NAMESPACE_NOTFOUND) {
- log.debug("Unable to change user permissions: " + toe);
+ log.debug("Unable to change user permissions: " + toe.getCause());
return;
}
}
[08/12] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT
(-sours)
Posted by bh...@apache.org.
Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT (-sours)
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d06a9ef7
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d06a9ef7
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/d06a9ef7
Branch: refs/heads/1.6.0-SNAPSHOT
Commit: d06a9ef798c82387cdaba814454b3208ccf3146b
Parents: 09ce814 f11eb1d
Author: Bill Havanki <bh...@cloudera.com>
Authored: Mon Feb 3 17:38:14 2014 -0500
Committer: Bill Havanki <bh...@cloudera.com>
Committed: Mon Feb 3 17:38:14 2014 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
[11/12] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT
Posted by bh...@apache.org.
Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/5117947c
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5117947c
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/5117947c
Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 5117947c4c9269fac2f6d1f2e5912b610c251116
Parents: 450a653 d06a9ef
Author: Bill Havanki <bh...@cloudera.com>
Authored: Mon Feb 3 17:38:37 2014 -0500
Committer: Bill Havanki <bh...@cloudera.com>
Committed: Mon Feb 3 17:38:37 2014 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
[02/12] git commit: Merge branch '1.6.0-SNAPSHOT' of
https://git-wip-us.apache.org/repos/asf/accumulo into 1.6.0-SNAPSHOT
Posted by bh...@apache.org.
Merge branch '1.6.0-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.6.0-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/450a653d
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/450a653d
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/450a653d
Branch: refs/heads/master
Commit: 450a653da2d1eb0f573c8820e6d82c821400b217
Parents: 9e32bf8 44eb7d4
Author: Josh Elser <el...@apache.org>
Authored: Mon Feb 3 15:48:34 2014 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Mon Feb 3 15:48:34 2014 -0500
----------------------------------------------------------------------
.../accumulo/test/randomwalk/concurrent/ChangePermissions.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
[07/12] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT
(-sours)
Posted by bh...@apache.org.
Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT (-sours)
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d06a9ef7
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d06a9ef7
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/d06a9ef7
Branch: refs/heads/1.5.1-SNAPSHOT
Commit: d06a9ef798c82387cdaba814454b3208ccf3146b
Parents: 09ce814 f11eb1d
Author: Bill Havanki <bh...@cloudera.com>
Authored: Mon Feb 3 17:38:14 2014 -0500
Committer: Bill Havanki <bh...@cloudera.com>
Committed: Mon Feb 3 17:38:14 2014 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
[05/12] git commit: ACCUMULO-2314 Fix nit typographical/grammar
issues.
Posted by bh...@apache.org.
ACCUMULO-2314 Fix nit typographical/grammar issues.
Signed-off-by: Bill Havanki <bh...@cloudera.com>
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f11eb1db
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f11eb1db
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/f11eb1db
Branch: refs/heads/1.4.5-SNAPSHOT
Commit: f11eb1db95ef032780609442476f429827d45fb6
Parents: 748276b
Author: Alex Moundalexis <al...@clouderagovt.com>
Authored: Mon Feb 3 14:58:14 2014 -0500
Committer: Bill Havanki <bh...@cloudera.com>
Committed: Mon Feb 3 17:35:02 2014 -0500
----------------------------------------------------------------------
bin/config.sh | 2 +-
.../main/java/org/apache/accumulo/server/logger/LogWriter.java | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f11eb1db/bin/config.sh
----------------------------------------------------------------------
diff --git a/bin/config.sh b/bin/config.sh
index 665777e..12f2096 100755
--- a/bin/config.sh
+++ b/bin/config.sh
@@ -28,7 +28,7 @@
# HADOOP_HOME Home dir for hadoop.
# MONITOR Machine to run monitor daemon on. Used by start-here.sh script
#
-# Iff ACCUMULO_VERIFY_ONLY is not set, this script will
+# If and only if ACCUMULO_VERIFY_ONLY is not set, this script will
# * Check for standalone mode (lack of masters and slaves files)
# - Do appropriate set up
# * Ensure the existence of ACCUMULO_LOG_DIR on the current host
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f11eb1db/src/server/src/main/java/org/apache/accumulo/server/logger/LogWriter.java
----------------------------------------------------------------------
diff --git a/src/server/src/main/java/org/apache/accumulo/server/logger/LogWriter.java b/src/server/src/main/java/org/apache/accumulo/server/logger/LogWriter.java
index a8bc87c..53104ef 100644
--- a/src/server/src/main/java/org/apache/accumulo/server/logger/LogWriter.java
+++ b/src/server/src/main/java/org/apache/accumulo/server/logger/LogWriter.java
@@ -287,7 +287,7 @@ class LogWriter implements MutationLogger.Iface {
FileSystem local = TraceFileSystem.wrap(FileSystem.getLocal(fs.getConf()).getRaw());
Path dest = new Path(fullyQualifiedFileName + ".recovered");
- log.debug("Sorting log file to DSF " + dest);
+ log.debug("Sorting log file to DFS " + dest);
fs.mkdirs(dest);
int part = 0;
@@ -325,7 +325,7 @@ class LogWriter implements MutationLogger.Iface {
private void writeSortedEntries(Path dest, int part, final List<Pair<LogFileKey,LogFileValue>> kv) throws IOException {
String path = dest + String.format("/part-r-%05d", part);
- log.debug("Writing partial log file to DSF " + path);
+ log.debug("Writing partial log file to DFS " + path);
log.debug("Sorting");
Span span = Trace.start("Logger sort");
span.data("logfile", dest.getName());
@@ -353,7 +353,7 @@ class LogWriter implements MutationLogger.Iface {
private void copyLog(final String localLog, final String fullyQualifiedFileName) throws IOException {
Path dest = new Path(fullyQualifiedFileName + ".copy");
- log.debug("Copying log file to DSF " + dest);
+ log.debug("Copying log file to DFS " + dest);
fs.delete(dest, true);
LogFileKey key = new LogFileKey();
LogFileValue value = new LogFileValue();
[06/12] git commit: ACCUMULO-2314 Fix nit typographical/grammar
issues.
Posted by bh...@apache.org.
ACCUMULO-2314 Fix nit typographical/grammar issues.
Signed-off-by: Bill Havanki <bh...@cloudera.com>
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f11eb1db
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f11eb1db
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/f11eb1db
Branch: refs/heads/master
Commit: f11eb1db95ef032780609442476f429827d45fb6
Parents: 748276b
Author: Alex Moundalexis <al...@clouderagovt.com>
Authored: Mon Feb 3 14:58:14 2014 -0500
Committer: Bill Havanki <bh...@cloudera.com>
Committed: Mon Feb 3 17:35:02 2014 -0500
----------------------------------------------------------------------
bin/config.sh | 2 +-
.../main/java/org/apache/accumulo/server/logger/LogWriter.java | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f11eb1db/bin/config.sh
----------------------------------------------------------------------
diff --git a/bin/config.sh b/bin/config.sh
index 665777e..12f2096 100755
--- a/bin/config.sh
+++ b/bin/config.sh
@@ -28,7 +28,7 @@
# HADOOP_HOME Home dir for hadoop.
# MONITOR Machine to run monitor daemon on. Used by start-here.sh script
#
-# Iff ACCUMULO_VERIFY_ONLY is not set, this script will
+# If and only if ACCUMULO_VERIFY_ONLY is not set, this script will
# * Check for standalone mode (lack of masters and slaves files)
# - Do appropriate set up
# * Ensure the existence of ACCUMULO_LOG_DIR on the current host
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f11eb1db/src/server/src/main/java/org/apache/accumulo/server/logger/LogWriter.java
----------------------------------------------------------------------
diff --git a/src/server/src/main/java/org/apache/accumulo/server/logger/LogWriter.java b/src/server/src/main/java/org/apache/accumulo/server/logger/LogWriter.java
index a8bc87c..53104ef 100644
--- a/src/server/src/main/java/org/apache/accumulo/server/logger/LogWriter.java
+++ b/src/server/src/main/java/org/apache/accumulo/server/logger/LogWriter.java
@@ -287,7 +287,7 @@ class LogWriter implements MutationLogger.Iface {
FileSystem local = TraceFileSystem.wrap(FileSystem.getLocal(fs.getConf()).getRaw());
Path dest = new Path(fullyQualifiedFileName + ".recovered");
- log.debug("Sorting log file to DSF " + dest);
+ log.debug("Sorting log file to DFS " + dest);
fs.mkdirs(dest);
int part = 0;
@@ -325,7 +325,7 @@ class LogWriter implements MutationLogger.Iface {
private void writeSortedEntries(Path dest, int part, final List<Pair<LogFileKey,LogFileValue>> kv) throws IOException {
String path = dest + String.format("/part-r-%05d", part);
- log.debug("Writing partial log file to DSF " + path);
+ log.debug("Writing partial log file to DFS " + path);
log.debug("Sorting");
Span span = Trace.start("Logger sort");
span.data("logfile", dest.getName());
@@ -353,7 +353,7 @@ class LogWriter implements MutationLogger.Iface {
private void copyLog(final String localLog, final String fullyQualifiedFileName) throws IOException {
Path dest = new Path(fullyQualifiedFileName + ".copy");
- log.debug("Copying log file to DSF " + dest);
+ log.debug("Copying log file to DFS " + dest);
fs.delete(dest, true);
LogFileKey key = new LogFileKey();
LogFileValue value = new LogFileValue();
[10/12] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT
Posted by bh...@apache.org.
Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/5117947c
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5117947c
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/5117947c
Branch: refs/heads/master
Commit: 5117947c4c9269fac2f6d1f2e5912b610c251116
Parents: 450a653 d06a9ef
Author: Bill Havanki <bh...@cloudera.com>
Authored: Mon Feb 3 17:38:37 2014 -0500
Committer: Bill Havanki <bh...@cloudera.com>
Committed: Mon Feb 3 17:38:37 2014 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
[03/12] git commit: ACCUMULO-2314 Fix nit typographical/grammar
issues.
Posted by bh...@apache.org.
ACCUMULO-2314 Fix nit typographical/grammar issues.
Signed-off-by: Bill Havanki <bh...@cloudera.com>
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f11eb1db
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f11eb1db
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/f11eb1db
Branch: refs/heads/1.5.1-SNAPSHOT
Commit: f11eb1db95ef032780609442476f429827d45fb6
Parents: 748276b
Author: Alex Moundalexis <al...@clouderagovt.com>
Authored: Mon Feb 3 14:58:14 2014 -0500
Committer: Bill Havanki <bh...@cloudera.com>
Committed: Mon Feb 3 17:35:02 2014 -0500
----------------------------------------------------------------------
bin/config.sh | 2 +-
.../main/java/org/apache/accumulo/server/logger/LogWriter.java | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f11eb1db/bin/config.sh
----------------------------------------------------------------------
diff --git a/bin/config.sh b/bin/config.sh
index 665777e..12f2096 100755
--- a/bin/config.sh
+++ b/bin/config.sh
@@ -28,7 +28,7 @@
# HADOOP_HOME Home dir for hadoop.
# MONITOR Machine to run monitor daemon on. Used by start-here.sh script
#
-# Iff ACCUMULO_VERIFY_ONLY is not set, this script will
+# If and only if ACCUMULO_VERIFY_ONLY is not set, this script will
# * Check for standalone mode (lack of masters and slaves files)
# - Do appropriate set up
# * Ensure the existence of ACCUMULO_LOG_DIR on the current host
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f11eb1db/src/server/src/main/java/org/apache/accumulo/server/logger/LogWriter.java
----------------------------------------------------------------------
diff --git a/src/server/src/main/java/org/apache/accumulo/server/logger/LogWriter.java b/src/server/src/main/java/org/apache/accumulo/server/logger/LogWriter.java
index a8bc87c..53104ef 100644
--- a/src/server/src/main/java/org/apache/accumulo/server/logger/LogWriter.java
+++ b/src/server/src/main/java/org/apache/accumulo/server/logger/LogWriter.java
@@ -287,7 +287,7 @@ class LogWriter implements MutationLogger.Iface {
FileSystem local = TraceFileSystem.wrap(FileSystem.getLocal(fs.getConf()).getRaw());
Path dest = new Path(fullyQualifiedFileName + ".recovered");
- log.debug("Sorting log file to DSF " + dest);
+ log.debug("Sorting log file to DFS " + dest);
fs.mkdirs(dest);
int part = 0;
@@ -325,7 +325,7 @@ class LogWriter implements MutationLogger.Iface {
private void writeSortedEntries(Path dest, int part, final List<Pair<LogFileKey,LogFileValue>> kv) throws IOException {
String path = dest + String.format("/part-r-%05d", part);
- log.debug("Writing partial log file to DSF " + path);
+ log.debug("Writing partial log file to DFS " + path);
log.debug("Sorting");
Span span = Trace.start("Logger sort");
span.data("logfile", dest.getName());
@@ -353,7 +353,7 @@ class LogWriter implements MutationLogger.Iface {
private void copyLog(final String localLog, final String fullyQualifiedFileName) throws IOException {
Path dest = new Path(fullyQualifiedFileName + ".copy");
- log.debug("Copying log file to DSF " + dest);
+ log.debug("Copying log file to DFS " + dest);
fs.delete(dest, true);
LogFileKey key = new LogFileKey();
LogFileValue value = new LogFileValue();
[09/12] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT
(-sours)
Posted by bh...@apache.org.
Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT (-sours)
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d06a9ef7
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d06a9ef7
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/d06a9ef7
Branch: refs/heads/master
Commit: d06a9ef798c82387cdaba814454b3208ccf3146b
Parents: 09ce814 f11eb1d
Author: Bill Havanki <bh...@cloudera.com>
Authored: Mon Feb 3 17:38:14 2014 -0500
Committer: Bill Havanki <bh...@cloudera.com>
Committed: Mon Feb 3 17:38:14 2014 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
[12/12] git commit: Merge branch '1.6.0-SNAPSHOT'
Posted by bh...@apache.org.
Merge branch '1.6.0-SNAPSHOT'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e9fe0226
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e9fe0226
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/e9fe0226
Branch: refs/heads/master
Commit: e9fe022664ff9e75f88a517044267b848434e389
Parents: 4879e7c 5117947
Author: Bill Havanki <bh...@cloudera.com>
Authored: Mon Feb 3 17:38:47 2014 -0500
Committer: Bill Havanki <bh...@cloudera.com>
Committed: Mon Feb 3 17:38:47 2014 -0500
----------------------------------------------------------------------
.../accumulo/test/randomwalk/concurrent/ChangePermissions.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
[04/12] git commit: ACCUMULO-2314 Fix nit typographical/grammar
issues.
Posted by bh...@apache.org.
ACCUMULO-2314 Fix nit typographical/grammar issues.
Signed-off-by: Bill Havanki <bh...@cloudera.com>
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f11eb1db
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f11eb1db
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/f11eb1db
Branch: refs/heads/1.6.0-SNAPSHOT
Commit: f11eb1db95ef032780609442476f429827d45fb6
Parents: 748276b
Author: Alex Moundalexis <al...@clouderagovt.com>
Authored: Mon Feb 3 14:58:14 2014 -0500
Committer: Bill Havanki <bh...@cloudera.com>
Committed: Mon Feb 3 17:35:02 2014 -0500
----------------------------------------------------------------------
bin/config.sh | 2 +-
.../main/java/org/apache/accumulo/server/logger/LogWriter.java | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f11eb1db/bin/config.sh
----------------------------------------------------------------------
diff --git a/bin/config.sh b/bin/config.sh
index 665777e..12f2096 100755
--- a/bin/config.sh
+++ b/bin/config.sh
@@ -28,7 +28,7 @@
# HADOOP_HOME Home dir for hadoop.
# MONITOR Machine to run monitor daemon on. Used by start-here.sh script
#
-# Iff ACCUMULO_VERIFY_ONLY is not set, this script will
+# If and only if ACCUMULO_VERIFY_ONLY is not set, this script will
# * Check for standalone mode (lack of masters and slaves files)
# - Do appropriate set up
# * Ensure the existence of ACCUMULO_LOG_DIR on the current host
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f11eb1db/src/server/src/main/java/org/apache/accumulo/server/logger/LogWriter.java
----------------------------------------------------------------------
diff --git a/src/server/src/main/java/org/apache/accumulo/server/logger/LogWriter.java b/src/server/src/main/java/org/apache/accumulo/server/logger/LogWriter.java
index a8bc87c..53104ef 100644
--- a/src/server/src/main/java/org/apache/accumulo/server/logger/LogWriter.java
+++ b/src/server/src/main/java/org/apache/accumulo/server/logger/LogWriter.java
@@ -287,7 +287,7 @@ class LogWriter implements MutationLogger.Iface {
FileSystem local = TraceFileSystem.wrap(FileSystem.getLocal(fs.getConf()).getRaw());
Path dest = new Path(fullyQualifiedFileName + ".recovered");
- log.debug("Sorting log file to DSF " + dest);
+ log.debug("Sorting log file to DFS " + dest);
fs.mkdirs(dest);
int part = 0;
@@ -325,7 +325,7 @@ class LogWriter implements MutationLogger.Iface {
private void writeSortedEntries(Path dest, int part, final List<Pair<LogFileKey,LogFileValue>> kv) throws IOException {
String path = dest + String.format("/part-r-%05d", part);
- log.debug("Writing partial log file to DSF " + path);
+ log.debug("Writing partial log file to DFS " + path);
log.debug("Sorting");
Span span = Trace.start("Logger sort");
span.data("logfile", dest.getName());
@@ -353,7 +353,7 @@ class LogWriter implements MutationLogger.Iface {
private void copyLog(final String localLog, final String fullyQualifiedFileName) throws IOException {
Path dest = new Path(fullyQualifiedFileName + ".copy");
- log.debug("Copying log file to DSF " + dest);
+ log.debug("Copying log file to DFS " + dest);
fs.delete(dest, true);
LogFileKey key = new LogFileKey();
LogFileValue value = new LogFileValue();