Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/lucene-solr

This commit is contained in:
Karl Wright 2016-05-01 06:09:51 -04:00
parent 516fb5d193 3b9aa4d5cc
commit 7bc4859daf
5 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lucene/core/src/java/org/apache/lucene/store/NativeFSLockFactory.java
View File

@ -176,7 +176,7 @@ public final class NativeFSLockFactory extends FSLockFactory {
// if it differs, someone deleted our lock file (and we are ineffective) // if it differs, someone deleted our lock file (and we are ineffective)
FileTime ctime = Files.readAttributes(path, BasicFileAttributes.class).creationTime(); FileTime ctime = Files.readAttributes(path, BasicFileAttributes.class).creationTime();
if (!creationTime.equals(ctime)) { if (!creationTime.equals(ctime)) {
throw new AlreadyClosedException("Underlying file changed by an external force at " + creationTime + ", (lock=" + this + ")"); throw new AlreadyClosedException("Underlying file changed by an external force at " + ctime + ", (lock=" + this + ")");
} }
} }
@ -199,7 +199,7 @@ public final class NativeFSLockFactory extends FSLockFactory {
@Override @Override
public String toString() { public String toString() {
return "NativeFSLock(path=" + path + ",impl=" + lock + ",ctime=" + creationTime + ")"; return "NativeFSLock(path=" + path + ",impl=" + lock + ",creationTime=" + creationTime + ")";
} }
} }
} }

4
lucene/core/src/java/org/apache/lucene/store/SimpleFSLockFactory.java
View File

@ -111,7 +111,7 @@ public final class SimpleFSLockFactory extends FSLockFactory {
// if it differs, someone deleted our lock file (and we are ineffective) // if it differs, someone deleted our lock file (and we are ineffective)
FileTime ctime = Files.readAttributes(path, BasicFileAttributes.class).creationTime(); FileTime ctime = Files.readAttributes(path, BasicFileAttributes.class).creationTime();
if (!creationTime.equals(ctime)) { if (!creationTime.equals(ctime)) {
throw new AlreadyClosedException("Underlying file changed by an external force at " + creationTime + ", (lock=" + this + ")"); throw new AlreadyClosedException("Underlying file changed by an external force at " + ctime + ", (lock=" + this + ")");
} }
} }
@ -144,7 +144,7 @@ public final class SimpleFSLockFactory extends FSLockFactory {
@Override @Override
public String toString() { public String toString() {
return "SimpleFSLock(path=" + path + ",ctime=" + creationTime + ")"; return "SimpleFSLock(path=" + path + ",creationTime=" + creationTime + ")";
} }
} }
} }

2
solr/CHANGES.txt
View File

@ -224,6 +224,8 @@ Other Changes
* SOLR-9037: Replace multiple "/replication" strings with one static constant. (Christine Poerschke) * SOLR-9037: Replace multiple "/replication" strings with one static constant. (Christine Poerschke)
* SOLR-9047: zkcli should allow alternative locations for log4j configuration (Gregory Chanan)
================== 6.0.0 ================== ================== 6.0.0 ==================
Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release

8
solr/server/scripts/cloud-scripts/zkcli.bat
View File

@ -9,4 +9,10 @@ REM Find location of this script
set SDIR=%~dp0 set SDIR=%~dp0
if "%SDIR:~-1%"=="\" set SDIR=%SDIR:~0,-1% if "%SDIR:~-1%"=="\" set SDIR=%SDIR:~0,-1%
"%JVM%" -Dlog4j.configuration="file:%SDIR%\log4j.properties" -classpath "%SDIR%\..\..\solr-webapp\webapp\WEB-INF\lib\*;%SDIR%\..\..\lib\ext\*" org.apache.solr.cloud.ZkCLI %* if defined LOG4J_PROPS (
set "LOG4J_CONFIG=file:%LOG4J_PROPS%"
) else (
set "LOG4J_CONFIG=file:%SDIR%\log4j.properties"
)
"%JVM%" -Dlog4j.configuration="%LOG4J_CONFIG%" -classpath "%SDIR%\..\..\solr-webapp\webapp\WEB-INF\lib\*;%SDIR%\..\..\lib\ext\*" org.apache.solr.cloud.ZkCLI %*

8
solr/server/scripts/cloud-scripts/zkcli.sh
View File

@ -9,5 +9,11 @@ JVM="java"
sdir="`dirname \"$0\"`" sdir="`dirname \"$0\"`"
PATH=$JAVA_HOME/bin:$PATH $JVM -Dlog4j.configuration=file:$sdir/log4j.properties -classpath "$sdir/../../solr-webapp/webapp/WEB-INF/lib/*:$sdir/../../lib/ext/*" org.apache.solr.cloud.ZkCLI ${1+"$@"} if [ -n "$LOG4J_PROPS" ]; then
log4j_config="file:$LOG4J_PROPS"
else
log4j_config="file:$sdir/log4j.properties"
fi
PATH=$JAVA_HOME/bin:$PATH $JVM -Dlog4j.configuration=$log4j_config -classpath "$sdir/../../solr-webapp/webapp/WEB-INF/lib/*:$sdir/../../lib/ext/*" org.apache.solr.cloud.ZkCLI ${1+"$@"}