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 2015/06/09 20:31:11 UTC
svn commit: r1684495 - in /lucene/dev/branches/branch_5x: ./ lucene/
lucene/test-framework/
lucene/test-framework/src/java/org/apache/lucene/util/ solr/ solr/contrib/
solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/
solr/contrib/map-reduce/src/...
Author: markrmiller
Date: Tue Jun 9 18:31:10 2015
New Revision: 1684495
URL: http://svn.apache.org/r1684495
Log:
SOLR-7512: SolrOutputFormat creates an invalid solr.xml in the solr home zip for MapReduceIndexerTool.
Added:
lucene/dev/branches/branch_5x/solr/licenses/curator-client-2.8.0.jar.sha1
- copied unchanged from r1684494, lucene/dev/trunk/solr/licenses/curator-client-2.8.0.jar.sha1
lucene/dev/branches/branch_5x/solr/licenses/curator-client-LICENSE-ASL.txt
- copied unchanged from r1684494, lucene/dev/trunk/solr/licenses/curator-client-LICENSE-ASL.txt
lucene/dev/branches/branch_5x/solr/licenses/curator-client-NOTICE.txt
- copied unchanged from r1684494, lucene/dev/trunk/solr/licenses/curator-client-NOTICE.txt
lucene/dev/branches/branch_5x/solr/licenses/curator-framework-2.8.0.jar.sha1
- copied unchanged from r1684494, lucene/dev/trunk/solr/licenses/curator-framework-2.8.0.jar.sha1
lucene/dev/branches/branch_5x/solr/licenses/curator-framework-LICENSE-ASL.txt
- copied unchanged from r1684494, lucene/dev/trunk/solr/licenses/curator-framework-LICENSE-ASL.txt
lucene/dev/branches/branch_5x/solr/licenses/curator-framework-NOTICE.txt
- copied unchanged from r1684494, lucene/dev/trunk/solr/licenses/curator-framework-NOTICE.txt
lucene/dev/branches/branch_5x/solr/licenses/hadoop-yarn-server-applicationhistoryservice-2.6.0.jar.sha1
- copied unchanged from r1684494, lucene/dev/trunk/solr/licenses/hadoop-yarn-server-applicationhistoryservice-2.6.0.jar.sha1
lucene/dev/branches/branch_5x/solr/licenses/hadoop-yarn-server-applicationhistoryservice-LICENSE-ASL.txt
- copied unchanged from r1684494, lucene/dev/trunk/solr/licenses/hadoop-yarn-server-applicationhistoryservice-LICENSE-ASL.txt
lucene/dev/branches/branch_5x/solr/licenses/hadoop-yarn-server-applicationhistoryservice-NOTICE.txt
- copied unchanged from r1684494, lucene/dev/trunk/solr/licenses/hadoop-yarn-server-applicationhistoryservice-NOTICE.txt
lucene/dev/branches/branch_5x/solr/licenses/leveldb-0.7.jar.sha1
- copied unchanged from r1684494, lucene/dev/trunk/solr/licenses/leveldb-0.7.jar.sha1
lucene/dev/branches/branch_5x/solr/licenses/leveldb-LICENSE-BSD.txt
- copied unchanged from r1684494, lucene/dev/trunk/solr/licenses/leveldb-LICENSE-BSD.txt
lucene/dev/branches/branch_5x/solr/licenses/leveldb-NOTICE.txt
- copied unchanged from r1684494, lucene/dev/trunk/solr/licenses/leveldb-NOTICE.txt
lucene/dev/branches/branch_5x/solr/licenses/leveldb-api-0.7.jar.sha1
- copied unchanged from r1684494, lucene/dev/trunk/solr/licenses/leveldb-api-0.7.jar.sha1
lucene/dev/branches/branch_5x/solr/licenses/leveldb-api-LICENSE-BSD.txt
- copied unchanged from r1684494, lucene/dev/trunk/solr/licenses/leveldb-api-LICENSE-BSD.txt
lucene/dev/branches/branch_5x/solr/licenses/leveldb-api-NOTICE.txt
- copied unchanged from r1684494, lucene/dev/trunk/solr/licenses/leveldb-api-NOTICE.txt
lucene/dev/branches/branch_5x/solr/licenses/leveldbjni-1.8.jar.sha1
- copied unchanged from r1684494, lucene/dev/trunk/solr/licenses/leveldbjni-1.8.jar.sha1
lucene/dev/branches/branch_5x/solr/licenses/leveldbjni-LICENSE-BSD.txt
- copied unchanged from r1684494, lucene/dev/trunk/solr/licenses/leveldbjni-LICENSE-BSD.txt
lucene/dev/branches/branch_5x/solr/licenses/leveldbjni-NOTICE.txt
- copied unchanged from r1684494, lucene/dev/trunk/solr/licenses/leveldbjni-NOTICE.txt
lucene/dev/branches/branch_5x/solr/test-framework/src/java/org/apache/solr/util/BadMrClusterThreadsFilter.java
- copied unchanged from r1684494, lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/util/BadMrClusterThreadsFilter.java
Modified:
lucene/dev/branches/branch_5x/ (props changed)
lucene/dev/branches/branch_5x/lucene/ (props changed)
lucene/dev/branches/branch_5x/lucene/ivy-versions.properties (contents, props changed)
lucene/dev/branches/branch_5x/lucene/test-framework/ (props changed)
lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleTemporaryFilesCleanup.java
lucene/dev/branches/branch_5x/solr/ (props changed)
lucene/dev/branches/branch_5x/solr/CHANGES.txt (contents, props changed)
lucene/dev/branches/branch_5x/solr/contrib/ (props changed)
lucene/dev/branches/branch_5x/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/SolrOutputFormat.java
lucene/dev/branches/branch_5x/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/ZooKeeperInspector.java
lucene/dev/branches/branch_5x/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MorphlineBasicMiniMRTest.java
lucene/dev/branches/branch_5x/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MorphlineGoLiveMiniMRTest.java
lucene/dev/branches/branch_5x/solr/contrib/morphlines-core/ivy.xml
lucene/dev/branches/branch_5x/solr/contrib/morphlines-core/src/test-files/log4j.properties
lucene/dev/branches/branch_5x/solr/contrib/morphlines-core/src/test-files/solr/minimr/solr.xml
lucene/dev/branches/branch_5x/solr/licenses/ (props changed)
lucene/dev/branches/branch_5x/solr/test-framework/ (props changed)
Modified: lucene/dev/branches/branch_5x/lucene/ivy-versions.properties
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/ivy-versions.properties?rev=1684495&r1=1684494&r2=1684495&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/ivy-versions.properties (original)
+++ lucene/dev/branches/branch_5x/lucene/ivy-versions.properties Tue Jun 9 18:31:10 2015
@@ -91,6 +91,11 @@ com.sun.jersey.version = 1.9
/org.apache.avro/avro = 1.7.5
/org.apache.commons/commons-compress = 1.8.1
/org.apache.commons/commons-math3 = 3.4.1
+
+org.apache.curator.version = 2.8.0
+/org.apache.curator/curator-client = ${org.apache.curator.version}
+/org.apache.curator/curator-framework = ${org.apache.curator.version}
+
/org.apache.derby/derby = 10.9.1.0
/org.apache.directory.server/apacheds-all = 2.0.0-M15
@@ -110,6 +115,7 @@ org.apache.hadoop.version = 2.6.0
/org.apache.hadoop/hadoop-yarn-api = ${org.apache.hadoop.version}
/org.apache.hadoop/hadoop-yarn-client = ${org.apache.hadoop.version}
/org.apache.hadoop/hadoop-yarn-common = ${org.apache.hadoop.version}
+/org.apache.hadoop/hadoop-yarn-server-applicationhistoryservice = ${org.apache.hadoop.version}
/org.apache.hadoop/hadoop-yarn-server-common = ${org.apache.hadoop.version}
/org.apache.hadoop/hadoop-yarn-server-nodemanager = ${org.apache.hadoop.version}
/org.apache.hadoop/hadoop-yarn-server-resourcemanager = ${org.apache.hadoop.version}
@@ -201,6 +207,8 @@ org.eclipse.jetty.version = 9.2.10.v2015
/org.eclipse.jetty/jetty-webapp = ${org.eclipse.jetty.version}
/org.eclipse.jetty/jetty-xml = ${org.eclipse.jetty.version}
+/org.fusesource.leveldbjni/leveldbjni = 1.8
+
org.gagravarr.vorbis.java.version = 0.6
/org.gagravarr/vorbis-java-core = ${org.gagravarr.vorbis.java.version}
/org.gagravarr/vorbis-java-tika = ${org.gagravarr.vorbis.java.version}
@@ -208,6 +216,10 @@ org.gagravarr.vorbis.java.version = 0.6
org.htrace.version = 3.0.4
/org.htrace/htrace-core = ${org.htrace.version}
+org.iq80.leveldb.version = 0.7
+/org.iq80.leveldb/leveldb = ${org.iq80.leveldb.version}
+/org.iq80.leveldb/leveldb-api = ${org.iq80.leveldb.version}
+
org.kitesdk.kite-morphlines.version = 0.12.1
/org.kitesdk/kite-morphlines-avro = ${org.kitesdk.kite-morphlines.version}
/org.kitesdk/kite-morphlines-core = ${org.kitesdk.kite-morphlines.version}
Modified: lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleTemporaryFilesCleanup.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleTemporaryFilesCleanup.java?rev=1684495&r1=1684494&r2=1684495&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleTemporaryFilesCleanup.java (original)
+++ lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleTemporaryFilesCleanup.java Tue Jun 9 18:31:10 2015
@@ -250,7 +250,7 @@ final class TestRuleTemporaryFilesCleanu
"Failed to get a temporary name too many times, check your temp directory and consider manually cleaning it: "
+ javaTempDir.toAbsolutePath());
}
- f = javaTempDir.resolve(prefix + " " + ctx.getRunnerSeedAsString()
+ f = javaTempDir.resolve(prefix + "_" + ctx.getRunnerSeedAsString()
+ "-" + String.format(Locale.ENGLISH, "%03d", attempt));
try {
Files.createDirectory(f);
Modified: lucene/dev/branches/branch_5x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/CHANGES.txt?rev=1684495&r1=1684494&r2=1684495&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_5x/solr/CHANGES.txt Tue Jun 9 18:31:10 2015
@@ -117,7 +117,9 @@ Bug Fixes
* SOLR-7574: A request with a json content type but no body caused a null pointer exception (yonik)
-
+* SOLR-7512: SolrOutputFormat creates an invalid solr.xml in the solr home zip for MapReduceIndexerTool.
+ (Mark Miller, Adam McElwee)
+
Other Changes
----------------------
Modified: lucene/dev/branches/branch_5x/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/SolrOutputFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/SolrOutputFormat.java?rev=1684495&r1=1684494&r2=1684495&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/SolrOutputFormat.java (original)
+++ lucene/dev/branches/branch_5x/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/SolrOutputFormat.java Tue Jun 9 18:31:10 2015
@@ -244,6 +244,7 @@ public class SolrOutputFormat<K, V> exte
ZipEntry ze = new ZipEntry("solr.xml");
zos.putNextEntry(ze);
+ zos.write("<solr></solr>".getBytes("UTF-8"));
zos.flush();
zos.closeEntry();
zos.close();
Modified: lucene/dev/branches/branch_5x/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/ZooKeeperInspector.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/ZooKeeperInspector.java?rev=1684495&r1=1684494&r2=1684495&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/ZooKeeperInspector.java (original)
+++ lucene/dev/branches/branch_5x/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/ZooKeeperInspector.java Tue Jun 9 18:31:10 2015
@@ -194,7 +194,7 @@ final class ZooKeeperInspector {
Files.move(dir, confDir);
dir = confDir.getParentFile();
}
- FileUtils.writeStringToFile(new File(dir, "solr.xml"), "<solr></solr>", "UTF-8");
+ FileUtils.writeStringToFile(new File(dir, "solr.xml"), "<solr><solrcloud></solrcloud></solr>", "UTF-8");
verifyConfigDir(confDir);
return dir;
}
Modified: lucene/dev/branches/branch_5x/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MorphlineBasicMiniMRTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MorphlineBasicMiniMRTest.java?rev=1684495&r1=1684494&r2=1684495&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MorphlineBasicMiniMRTest.java (original)
+++ lucene/dev/branches/branch_5x/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MorphlineBasicMiniMRTest.java Tue Jun 9 18:31:10 2015
@@ -45,17 +45,28 @@ import org.apache.solr.cloud.AbstractZkT
import org.apache.solr.hadoop.hack.MiniMRCluster;
import org.apache.solr.morphlines.solr.AbstractSolrMorphlineTestBase;
import org.apache.solr.util.BadHdfsThreadsFilter;
+import org.apache.solr.util.BadMrClusterThreadsFilter;
import org.junit.After;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
+import com.carrotsearch.randomizedtesting.annotations.Nightly;
+import com.carrotsearch.randomizedtesting.annotations.ThreadLeakAction;
+import com.carrotsearch.randomizedtesting.annotations.ThreadLeakAction.Action;
import com.carrotsearch.randomizedtesting.annotations.ThreadLeakFilters;
-
+import com.carrotsearch.randomizedtesting.annotations.ThreadLeakLingering;
+import com.carrotsearch.randomizedtesting.annotations.ThreadLeakZombies;
+import com.carrotsearch.randomizedtesting.annotations.ThreadLeakZombies.Consequence;
+
+@ThreadLeakAction({Action.WARN})
+@ThreadLeakLingering(linger = 0)
+@ThreadLeakZombies(Consequence.CONTINUE)
@ThreadLeakFilters(defaultFilters = true, filters = {
- BadHdfsThreadsFilter.class // hdfs currently leaks thread(s)
+ BadHdfsThreadsFilter.class, BadMrClusterThreadsFilter.class // hdfs currently leaks thread(s)
})
@Slow
+@Nightly
public class MorphlineBasicMiniMRTest extends SolrTestCaseJ4 {
private static final boolean ENABLE_LOCAL_JOB_RUNNER = false; // for debugging only
@@ -104,9 +115,6 @@ public class MorphlineBasicMiniMRTest ex
@BeforeClass
public static void setupClass() throws Exception {
solrHomeDirectory = createTempDir().toFile();
- assumeTrue(
- "Currently this test can only be run without the lucene test security policy in place",
- System.getProperty("java.security.manager", "").equals(""));
assumeFalse("HDFS tests were disabled by -Dtests.disableHdfs",
Boolean.parseBoolean(System.getProperty("tests.disableHdfs", "false")));
@@ -152,6 +160,8 @@ public class MorphlineBasicMiniMRTest ex
conf.set(YarnConfiguration.NM_LOCAL_DIRS, dataDir.getPath() + File.separator + "nm-local-dirs");
conf.set(YarnConfiguration.DEFAULT_NM_LOG_DIRS, dataDir + File.separator + "nm-logs");
conf.set("testWorkDir", dataDir.getPath() + File.separator + "testWorkDir");
+ conf.set("mapreduce.jobhistory.minicluster.fixed.ports", "false");
+ conf.set("mapreduce.jobhistory.admin.address", "0.0.0.0:0");
dfsCluster = new MiniDFSCluster(conf, dataNodes, true, null);
FileSystem fileSystem = dfsCluster.getFileSystem();
@@ -176,6 +186,7 @@ public class MorphlineBasicMiniMRTest ex
System.clearProperty("test.build.dir");
System.clearProperty("test.build.data");
System.clearProperty("test.cache.data");
+
if (mrCluster != null) {
mrCluster.shutdown();
mrCluster = null;
@@ -184,6 +195,8 @@ public class MorphlineBasicMiniMRTest ex
dfsCluster.shutdown();
dfsCluster = null;
}
+
+ FileSystem.closeAll();
}
@After
Modified: lucene/dev/branches/branch_5x/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MorphlineGoLiveMiniMRTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MorphlineGoLiveMiniMRTest.java?rev=1684495&r1=1684494&r2=1684495&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MorphlineGoLiveMiniMRTest.java (original)
+++ lucene/dev/branches/branch_5x/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MorphlineGoLiveMiniMRTest.java Tue Jun 9 18:31:10 2015
@@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.apache.solr.hadoop;
import java.io.File;
@@ -73,10 +74,12 @@ import org.apache.solr.hadoop.hack.MiniM
import org.apache.solr.hadoop.hack.MiniMRClientClusterFactory;
import org.apache.solr.morphlines.solr.AbstractSolrMorphlineTestBase;
import org.apache.solr.util.BadHdfsThreadsFilter;
+import org.apache.solr.util.BadMrClusterThreadsFilter;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
+import com.carrotsearch.randomizedtesting.annotations.Nightly;
import com.carrotsearch.randomizedtesting.annotations.ThreadLeakAction;
import com.carrotsearch.randomizedtesting.annotations.ThreadLeakAction.Action;
import com.carrotsearch.randomizedtesting.annotations.ThreadLeakFilters;
@@ -88,10 +91,11 @@ import com.carrotsearch.randomizedtestin
@ThreadLeakLingering(linger = 0)
@ThreadLeakZombies(Consequence.CONTINUE)
@ThreadLeakFilters(defaultFilters = true, filters = {
- BadHdfsThreadsFilter.class // hdfs currently leaks thread(s)
+ BadHdfsThreadsFilter.class, BadMrClusterThreadsFilter.class // hdfs currently leaks thread(s)
})
@SuppressSSL // SSL does not work with this test for currently unknown reasons
@Slow
+@Nightly
public class MorphlineGoLiveMiniMRTest extends AbstractFullDistribZkTestBase {
private static final int RECORD_COUNT = 2104;
@@ -133,9 +137,6 @@ public class MorphlineGoLiveMiniMRTest e
System.setProperty("solr.hdfs.blockcache.blocksperbank", "2048");
solrHomeDirectory = createTempDir().toFile();
- assumeTrue(
- "Currently this test can only be run without the lucene test security policy in place",
- System.getProperty("java.security.manager", "").equals(""));
assumeFalse("HDFS tests were disabled by -Dtests.disableHdfs",
Boolean.parseBoolean(System.getProperty("tests.disableHdfs", "false")));
@@ -155,14 +156,15 @@ public class MorphlineGoLiveMiniMRTest e
System.setProperty("hadoop.log.dir", new File(tempDir, "logs").getAbsolutePath());
- int taskTrackers = 2;
int dataNodes = 2;
JobConf conf = new JobConf();
conf.set("dfs.block.access.token.enable", "false");
conf.set("dfs.permissions", "true");
conf.set("hadoop.security.authentication", "simple");
-
+ conf.set("mapreduce.jobhistory.minicluster.fixed.ports", "false");
+ conf.set("mapreduce.jobhistory.admin.address", "0.0.0.0:0");
+
conf.set(YarnConfiguration.NM_LOCAL_DIRS, tempDir + File.separator + "nm-local-dirs");
conf.set(YarnConfiguration.DEFAULT_NM_LOG_DIRS, tempDir + File.separator + "nm-logs");
@@ -225,7 +227,7 @@ public class MorphlineGoLiveMiniMRTest e
System.clearProperty("test.cache.data");
if (mrCluster != null) {
- //mrCluster.close();
+ mrCluster.stop();
mrCluster = null;
}
if (dfsCluster != null) {
@@ -343,6 +345,7 @@ public class MorphlineGoLiveMiniMRTest e
return concat(head, args);
}
+ @Nightly
@Test
public void test() throws Exception {
@@ -515,7 +518,7 @@ public class MorphlineGoLiveMiniMRTest e
// try using zookeeper with replication
String replicatedCollection = "replicated_collection";
if (TEST_NIGHTLY) {
- createCollection(replicatedCollection, 11, 3, 11);
+ createCollection(replicatedCollection, 7, 3, 9);
} else {
createCollection(replicatedCollection, 2, 3, 2);
}
@@ -647,7 +650,7 @@ public class MorphlineGoLiveMiniMRTest e
}
if (TEST_NIGHTLY) {
- createCollection(replicatedCollection, 11, 3, 11);
+ createCollection(replicatedCollection, 7, 3, 9);
} else {
createCollection(replicatedCollection, 2, 3, 2);
}
@@ -753,7 +756,8 @@ public class MorphlineGoLiveMiniMRTest e
props.setProperty("solrconfig", solrConfigOverride);
if (schemaOverride != null)
props.setProperty("schema", schemaOverride);
- props.setProperty("shards", shardList);
+ if (shardList != null)
+ props.setProperty("shards", shardList);
String collection = System.getProperty("collection");
if (collection == null)
Modified: lucene/dev/branches/branch_5x/solr/contrib/morphlines-core/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/contrib/morphlines-core/ivy.xml?rev=1684495&r1=1684494&r2=1684495&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/contrib/morphlines-core/ivy.xml (original)
+++ lucene/dev/branches/branch_5x/solr/contrib/morphlines-core/ivy.xml Tue Jun 9 18:31:10 2015
@@ -59,6 +59,13 @@
<artifact name="hadoop-mapreduce-client-jobclient" type="jar" ext="jar" />
<artifact name="hadoop-mapreduce-client-jobclient" type="test" ext="jar" maven:classifier="tests" />
</dependency>
+
+ <dependency org="org.apache.hadoop" name="hadoop-yarn-server-applicationhistoryservice" rev="${/org.apache.hadoop/hadoop-yarn-server-applicationhistoryservice}" conf="test"/>
+ <dependency org="org.fusesource.leveldbjni" name="leveldbjni" rev="${/org.fusesource.leveldbjni/leveldbjni}" conf="test"/>
+ <dependency org="org.iq80.leveldb" name="leveldb" rev="${/org.iq80.leveldb/leveldb}" conf="test.DfsMiniCluster"/>
+ <dependency org="org.iq80.leveldb" name="leveldb-api" rev="${/org.iq80.leveldb/leveldb-api}" conf="test.DfsMiniCluster"/>
+ <dependency org="org.apache.curator" name="curator-framework" rev="${/org.apache.curator/curator-framework}" conf="test"/>
+ <dependency org="org.apache.curator" name="curator-client" rev="${/org.apache.curator/curator-client}" conf="test"/>
<dependency org="aopalliance" name="aopalliance" rev="${/aopalliance/aopalliance}" conf="test" />
<dependency org="com.sun.xml.bind" name="jaxb-impl" rev="${/com.sun.xml.bind/jaxb-impl}" conf="test" />
Modified: lucene/dev/branches/branch_5x/solr/contrib/morphlines-core/src/test-files/log4j.properties
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/contrib/morphlines-core/src/test-files/log4j.properties?rev=1684495&r1=1684494&r2=1684495&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/contrib/morphlines-core/src/test-files/log4j.properties (original)
+++ lucene/dev/branches/branch_5x/solr/contrib/morphlines-core/src/test-files/log4j.properties Tue Jun 9 18:31:10 2015
@@ -3,10 +3,5 @@ log4j.rootLogger=INFO, CONSOLE
log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
log4j.appender.CONSOLE.Target=System.err
-log4j.appender.CONSOLE.layout=org.apache.solr.util.SolrLogLayout
-log4j.appender.CONSOLE.layout.ConversionPattern=%-5p - %d{yyyy-MM-dd HH:mm:ss.SSS}; %C; %m\n
-
-log4j.logger.org.apache.zookeeper=WARN
-log4j.logger.org.apache.hadoop=WARN
-#log4j.logger.org.apache.solr=WARN
-log4j.logger.org.apache.solr.hadoop=INFO
\ No newline at end of file
+log4j.appender.CONSOLE.layout=org.apache.log4j.EnhancedPatternLayout
+log4j.appender.CONSOLE.layout.ConversionPattern=%-4r %-5p (%t) [%X{node_name} %X{collection} %X{shard} %X{replica} %X{core}] %c{1.} %m%n
Modified: lucene/dev/branches/branch_5x/solr/contrib/morphlines-core/src/test-files/solr/minimr/solr.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/contrib/morphlines-core/src/test-files/solr/minimr/solr.xml?rev=1684495&r1=1684494&r2=1684495&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/contrib/morphlines-core/src/test-files/solr/minimr/solr.xml (original)
+++ lucene/dev/branches/branch_5x/solr/contrib/morphlines-core/src/test-files/solr/minimr/solr.xml Tue Jun 9 18:31:10 2015
@@ -22,25 +22,25 @@
persistent: Save changes made via the API to this file
sharedLib: path to a lib directory that will be shared across all cores
-->
-<solr persistent="${solr.xml.persist:false}">
+<solr>
<str name="shareSchema">${shareSchema:false}</str>
<solrcloud>
- <str name="host">127.0.0.1</str>
- <int name="hostPort">${hostPort:8983}</int>
- <str name="hostContext">${hostContext:solr}</str>
- <bool name="genericCoreNodeNames">${genericCoreNodeNames:true}</bool>
- <int name="leaderVoteWait">0</int>
- <int name="distribUpdateSoTimeout">${distribUpdateSoTimeout:120000}</int>
- <int name="distribUpdateConnTimeout">${distribUpdateConnTimeout:15000}</int>
- <int name="zkClientTimeout">${solr.zkclienttimeout:30000}</int>
-
+ <str name="host">127.0.0.1</str>
+ <int name="hostPort">${hostPort:8983}</int>
+ <str name="hostContext">${hostContext:solr}</str>
+ <bool name="genericCoreNodeNames">${genericCoreNodeNames:true}</bool>
+ <int name="leaderVoteWait">0</int>
+ <int name="distribUpdateSoTimeout">${distribUpdateSoTimeout:120000}</int>
+ <int name="distribUpdateConnTimeout">${distribUpdateConnTimeout:15000}</int>
+ <int name="zkClientTimeout">${solr.zkclienttimeout:30000}</int>
+ </solrcloud>
<shardHandlerFactory name="shardHandlerFactory" class="HttpShardHandlerFactory">
<str name="urlScheme">${urlScheme:}</str>
<int name="socketTimeout">${socketTimeout:120000}</int>
<int name="connTimeout">${connTimeout:15000}</int>
- </shardHandlerFactory>
+ </shardHandlerFactory>
</solr>