Merge branch '1.5.1-SNAPSHOT'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/77cac56e Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/77cac56e Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/77cac56e Branch: refs/heads/master Commit: 77cac56ec964a3ed620ee7e2858927ec09e40c34 Parents: af5a8aa 978770c Author: Eric Newton <[email protected]> Authored: Wed Jul 24 15:10:18 2013 -0400 Committer: Eric Newton <[email protected]> Committed: Wed Jul 24 15:10:18 2013 -0400 ---------------------------------------------------------------------- .../org/apache/accumulo/server/tabletserver/Compactor.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/77cac56e/server/src/main/java/org/apache/accumulo/server/tabletserver/Compactor.java ---------------------------------------------------------------------- diff --cc server/src/main/java/org/apache/accumulo/server/tabletserver/Compactor.java index 60ec7c0,8e4af64..480fbaa --- a/server/src/main/java/org/apache/accumulo/server/tabletserver/Compactor.java +++ b/server/src/main/java/org/apache/accumulo/server/tabletserver/Compactor.java @@@ -282,10 -284,12 +286,13 @@@ public class Compactor implements Calla clearStats(); + String oldThreadName = Thread.currentThread().getName(); + String newThreadName = "MajC compacting " + extent.toString() + " started " + dateFormatter.format(new Date()) + " file: " + outputFile; + Thread.currentThread().setName(newThreadName); try { FileOperations fileFactory = FileOperations.getInstance(); - mfw = fileFactory.openWriter(outputFile, fs, conf, acuTableConf); + FileSystem ns = this.fs.getFileSystemByPath(outputFile.path()); + mfw = fileFactory.openWriter(outputFile.path().toString(), ns, ns.getConf(), acuTableConf); Map<String,Set<ByteSequence>> lGroups; try {
