honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix silly smoke_test_plugin bugs when ES actually succeeds in starting with the installed plugins

This commit is contained in:
Michael McCandless 2015-07-03 05:59:16 -04:00 committed by mikemccand
parent 13602a591f
commit 275fdcc08d
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
dev-tools/smoke_test_plugins.py
View File

@ -79,10 +79,10 @@ def readServerOutput(p, startupEvent, failureEvent):
startupEvent.set() startupEvent.set()
print('ES: **process exit**\n') print('ES: **process exit**\n')
break break
line = line.decode('utf-8') line = line.decode('utf-8').rstrip()
if line.endswith('started') and not startupEvent.isSet(): if line.endswith('started') and not startupEvent.isSet():
startupEvent.set() startupEvent.set()
print('ES: %s' % line.rstrip()) print('ES: %s' % line)
except: except:
print() print()
print('Exception reading Elasticsearch output:') print('Exception reading Elasticsearch output:')
@ -109,14 +109,14 @@ if __name__ == '__main__':
run('tar -xzf core/target/releases/%s -C %s' % (artifact, tmp_dir)) run('tar -xzf core/target/releases/%s -C %s' % (artifact, tmp_dir))
es_install_dir = os.path.join(tmp_dir, artifact[:-7]) es_install_dir = os.path.join(tmp_dir, artifact[:-7])
es_plugin_path = os.path.join(es_install_dir, 'bin/plugin') es_plugin_path = os.path.join(es_install_dir, 'bin/plugin')
plugin_names = set() installed_plugin_names = set()
print('Find plugins:') print('Find plugins:')
for name in os.listdir('plugins'): for name in os.listdir('plugins'):
if name not in ('target', 'pom.xml'): if name not in ('target', 'pom.xml'):
url = 'file://%s/plugins/%s/target/releases/elasticsearch-%s-2.0.0-SNAPSHOT.zip' % (os.path.abspath('.'), name, name) url = 'file://%s/plugins/%s/target/releases/elasticsearch-%s-2.0.0-SNAPSHOT.zip' % (os.path.abspath('.'), name, name)
print(' install plugin %s...' % name) print(' install plugin %s...' % name)
run('%s; %s --url %s -install %s' % (JAVA_ENV, es_plugin_path, url, name)) run('%s; %s --url %s -install %s' % (JAVA_ENV, es_plugin_path, url, name))
plugin_names.add(name) installed_plugin_names.add(name)
print('Start Elasticsearch') print('Start Elasticsearch')
@ -153,11 +153,12 @@ if __name__ == '__main__':
for _, node in nodes.items(): for _, node in nodes.items():
node_plugins = node['plugins'] node_plugins = node['plugins']
for node_plugin in node_plugins: for node_plugin in node_plugins:
if not plugin_names.get(node_plugin['name'], False): plugin_name = node_plugin['name']
raise RuntimeError('Unexpeced plugin %s' % node_plugin['name']) if plugin_name not in installed_plugin_names:
del plugin_names[node_plugin['name']] raise RuntimeError('Unexpeced plugin %s' % plugin_name)
if plugin_names: installed_plugin_names.remove(plugin_name)
raise RuntimeError('Plugins not loaded %s' % list(plugin_names.keys())) if len(installed_plugin_names) > 0:
raise RuntimeError('Plugins not loaded %s' % installed_plugin_names)
else: else:
raise RuntimeError('Expected HTTP 200 but got %s' % res.status) raise RuntimeError('Expected HTTP 200 but got %s' % res.status)
finally: finally: