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/12/06 17:44:53 UTC
svn commit: r1548590 - in /lucene/dev/trunk/solr: CHANGES.txt
core/src/java/org/apache/solr/store/hdfs/HdfsLockFactory.java
core/src/test/org/apache/solr/store/hdfs/HdfsLockFactoryTest.java
Author: markrmiller
Date: Fri Dec 6 16:44:53 2013
New Revision: 1548590
URL: http://svn.apache.org/r1548590
Log:
SOLR-5540: HdfsLockFactory should explicitly create the lock parent directory if necessary.
Modified:
lucene/dev/trunk/solr/CHANGES.txt
lucene/dev/trunk/solr/core/src/java/org/apache/solr/store/hdfs/HdfsLockFactory.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/store/hdfs/HdfsLockFactoryTest.java
Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1548590&r1=1548589&r2=1548590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Fri Dec 6 16:44:53 2013
@@ -191,6 +191,9 @@ Bug Fixes
* SOLR-5524: Exception when using Query Function inside Scale Function.
(Trey Grainger, yonik)
+
+* SOLR-5540: HdfsLockFactory should explicitly create the lock parent directory if
+ necessary. (Mark Miller)
Optimizations
----------------------
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/store/hdfs/HdfsLockFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/store/hdfs/HdfsLockFactory.java?rev=1548590&r1=1548589&r2=1548590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/store/hdfs/HdfsLockFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/store/hdfs/HdfsLockFactory.java Fri Dec 6 16:44:53 2013
@@ -21,14 +21,18 @@ import java.io.IOException;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FSDataOutputStream;
+import org.apache.hadoop.fs.FileAlreadyExistsException;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.lucene.store.Lock;
import org.apache.lucene.store.LockFactory;
import org.apache.lucene.store.LockReleaseFailedException;
import org.apache.solr.util.IOUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class HdfsLockFactory extends LockFactory {
+ public static Logger log = LoggerFactory.getLogger(HdfsLockFactory.class);
private Path lockPath;
private Configuration configuration;
@@ -98,9 +102,14 @@ public class HdfsLockFactory extends Loc
FileSystem fs = null;
try {
fs = FileSystem.newInstance(lockPath.toUri(), conf);
-
+ if (!fs.exists(lockPath)) {
+ fs.mkdirs(lockPath);
+ }
file = fs.create(new Path(lockPath, lockName), false);
- } catch (IOException e) {
+ } catch (FileAlreadyExistsException e) {
+ return false;
+ }catch (IOException e) {
+ log.error("Error creating lock file", e);
return false;
} finally {
IOUtils.closeQuietly(file);
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/store/hdfs/HdfsLockFactoryTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/store/hdfs/HdfsLockFactoryTest.java?rev=1548590&r1=1548589&r2=1548590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/store/hdfs/HdfsLockFactoryTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/store/hdfs/HdfsLockFactoryTest.java Fri Dec 6 16:44:53 2013
@@ -68,7 +68,7 @@ public class HdfsLockFactoryTest extends
@Test
public void testBasic() throws IOException {
URI uri = dfsCluster.getURI();
- Path lockPath = new Path(uri.toString(), "/lock");
+ Path lockPath = new Path(uri.toString(), "/basedir/lock");
HdfsLockFactory lockFactory = new HdfsLockFactory(lockPath, new Configuration());
Lock lock = lockFactory.makeLock("testlock");
boolean success = lock.obtain();