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

SOLR-6708: stop orphaned Solr nodes before starting another one 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1637980 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Timothy Potter 2014-11-10 20:57:39 +00:00
parent 53bba16ee1
commit 71735447bc
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dev-tools/scripts/smokeTestRelease.py
View File

@ -859,7 +859,10 @@ def testSolrExample(unpackPath, javaPath, isSrc):
env.update(os.environ) env.update(os.environ)
env['JAVA_HOME'] = javaPath env['JAVA_HOME'] = javaPath
env['PATH'] = '%s/bin:%s' % (javaPath, env['PATH']) env['PATH'] = '%s/bin:%s' % (javaPath, env['PATH'])
server = subprocess.Popen(['bin/solr', '-f'], stdout=subprocess.PIPE, stderr=subprocess.STDOUT, stdin=subprocess.PIPE, env=env) # Stop Solr running on port 8983 (in case a previous run didn't shutdown cleanly)
subprocess.call(['bin/solr','stop','-p','8983'])
print(' starting Solr on port 8983 from %s' % unpackPath)
server = subprocess.Popen(['bin/solr', '-f', '-p', '8983'], stdout=subprocess.PIPE, stderr=subprocess.STDOUT, stdin=subprocess.PIPE, env=env)
startupEvent = threading.Event() startupEvent = threading.Event()
failureEvent = threading.Event() failureEvent = threading.Event()
@ -887,9 +890,7 @@ def testSolrExample(unpackPath, javaPath, isSrc):
print(' test utf8...') print(' test utf8...')
run('sh ./exampledocs/test_utf8.sh http://localhost:8983/solr/techproducts', 'utf8.log') run('sh ./exampledocs/test_utf8.sh http://localhost:8983/solr/techproducts', 'utf8.log')
print(' index example docs...') print(' index example docs...')
# "$JAVA" -Durl=http://localhost:$SOLR_PORT/solr/$EXAMPLE/update -jar $SOLR_TIP/example/exampledocs/post.jar $SOLR_TIP/example/exampledocs/*.xml
run('java -Durl=http://localhost:8983/solr/techproducts/update -jar ./exampledocs/post.jar ./exampledocs/*.xml', 'post-example-docs.log') run('java -Durl=http://localhost:8983/solr/techproducts/update -jar ./exampledocs/post.jar ./exampledocs/*.xml', 'post-example-docs.log')
#run('sh ./exampledocs/post.sh ./exampledocs/*.xml', 'post-example-docs.log')
print(' run query...') print(' run query...')
s = urllib.request.urlopen('http://localhost:8983/solr/techproducts/select/?q=video').read().decode('UTF-8') s = urllib.request.urlopen('http://localhost:8983/solr/techproducts/select/?q=video').read().decode('UTF-8')
if s.find('<result name="response" numFound="3" start="0">') == -1: if s.find('<result name="response" numFound="3" start="0">') == -1:
@ -898,7 +899,6 @@ def testSolrExample(unpackPath, javaPath, isSrc):
finally: finally:
# Stop server: # Stop server:
print(' stop server using: bin/solr stop -p 8983') print(' stop server using: bin/solr stop -p 8983')
#os.kill(server.pid, signal.SIGINT)
if isSrc: if isSrc:
os.chdir(unpackPath+'/solr') os.chdir(unpackPath+'/solr')
else: else: