You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2013/08/14 15:03:27 UTC
svn commit: r1513860 - in /lucene/dev/branches/branch_4x: ./ solr/
solr/CHANGES.txt solr/core/
solr/core/src/java/org/apache/solr/store/hdfs/HdfsDirectory.java
solr/core/src/java/org/apache/solr/store/hdfs/HdfsFileWriter.java
Author: markrmiller
Date: Wed Aug 14 13:03:27 2013
New Revision: 1513860
URL: http://svn.apache.org/r1513860
Log:
SOLR-5134: Fix CHANGES and close
Modified:
lucene/dev/branches/branch_4x/ (props changed)
lucene/dev/branches/branch_4x/solr/ (props changed)
lucene/dev/branches/branch_4x/solr/CHANGES.txt (contents, props changed)
lucene/dev/branches/branch_4x/solr/core/ (props changed)
lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/store/hdfs/HdfsDirectory.java
lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/store/hdfs/HdfsFileWriter.java
Modified: lucene/dev/branches/branch_4x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/CHANGES.txt?rev=1513860&r1=1513859&r2=1513860&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_4x/solr/CHANGES.txt Wed Aug 14 13:03:27 2013
@@ -101,7 +101,8 @@ Optimizations
* SOLR-5044: Admin UI - Note on Core-Admin about directories while creating
core (steffkes)
-* SOLR-5134: Have HdfsIndexOutput extend BufferedIndexOutput. (Mark Miller)
+* SOLR-5134: Have HdfsIndexOutput extend BufferedIndexOutput.
+ (Mark Miller, Uwe Schindler)
Other Changes
----------------------
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/store/hdfs/HdfsDirectory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/store/hdfs/HdfsDirectory.java?rev=1513860&r1=1513859&r2=1513860&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/store/hdfs/HdfsDirectory.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/store/hdfs/HdfsDirectory.java Wed Aug 14 13:03:27 2013
@@ -34,8 +34,8 @@ import org.apache.lucene.store.IOContext
import org.apache.lucene.store.IndexInput;
import org.apache.lucene.store.IndexOutput;
import org.apache.lucene.store.NoLockFactory;
+import org.apache.lucene.util.IOUtils;
import org.apache.solr.store.blockcache.CustomBufferedIndexInput;
-import org.apache.solr.util.IOUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -63,7 +63,7 @@ public class HdfsDirectory extends Direc
fileSystem.mkdirs(hdfsDirPath);
}
} catch (Exception e) {
- IOUtils.closeQuietly(fileSystem);
+ org.apache.solr.util.IOUtils.closeQuietly(fileSystem);
throw new RuntimeException("Problem creating directory: " + hdfsDirPath,
e);
}
@@ -225,12 +225,14 @@ public class HdfsDirectory extends Direc
@Override
public void close() throws IOException {
+ IOException priorE = null;
try {
super.close();
- } catch (Throwable t) {
- LOG.error("Error while closing", t);
+ } catch (IOException ioe) {
+ priorE = ioe;
+ } finally {
+ IOUtils.closeWhileHandlingException(priorE, writer);
}
- writer.close();
}
@Override
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/store/hdfs/HdfsFileWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/store/hdfs/HdfsFileWriter.java?rev=1513860&r1=1513859&r2=1513860&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/store/hdfs/HdfsFileWriter.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/store/hdfs/HdfsFileWriter.java Wed Aug 14 13:03:27 2013
@@ -17,6 +17,7 @@ package org.apache.solr.store.hdfs;
* limitations under the License.
*/
+import java.io.Closeable;
import java.io.IOException;
import java.util.EnumSet;
@@ -31,7 +32,7 @@ import org.apache.lucene.store.DataOutpu
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class HdfsFileWriter extends DataOutput {
+public class HdfsFileWriter extends DataOutput implements Closeable {
public static Logger LOG = LoggerFactory.getLogger(HdfsFileWriter.class);
public static final String HDFS_SYNC_BLOCK = "solr.hdfs.sync.block";