Unused imports, unused variables and such. Initially, there were no functional changes, just to get rid of some standard CodeQL warnings. I've then broken the CI, as apparently there's a install time(!?) Python script creation for the sole purpose of product naming. I changed it - we have it in etcdir, as SCYLLA-PRODUCT-FILE. So added (copied from a different script) a get_product() helper function in scylla_util.py and used it instead. While at it, also fixed the too broad import from scylla_util, which 'forced' me to also fix other specific imports (such as shutil). Improvement - no need to backport. Signed-off-by: Yaniv Kaul <yaniv.kaul@scylladb.com> Closes scylladb/scylladb#27883
35 lines
896 B
Python
Executable File
35 lines
896 B
Python
Executable File
#!/usr/bin/env python3
|
|
# -*- coding: utf-8 -*-
|
|
|
|
import sys
|
|
import signal
|
|
import subprocess
|
|
import scyllasetup
|
|
import logging
|
|
import commandlineparser
|
|
|
|
logging.basicConfig(stream=sys.stdout, level=logging.DEBUG, format="%(message)s")
|
|
|
|
supervisord = None
|
|
|
|
def signal_handler(signum, frame):
|
|
supervisord.send_signal(signum)
|
|
|
|
signal.signal(signal.SIGINT, signal_handler)
|
|
signal.signal(signal.SIGTERM, signal_handler)
|
|
|
|
try:
|
|
arguments, extra_arguments = commandlineparser.parse()
|
|
setup = scyllasetup.ScyllaSetup(arguments, extra_arguments=extra_arguments)
|
|
setup.developerMode()
|
|
setup.cpuSet()
|
|
setup.io()
|
|
setup.cqlshrc()
|
|
setup.write_rackdc_properties()
|
|
setup.arguments()
|
|
setup.set_housekeeping()
|
|
supervisord = subprocess.Popen(["/usr/bin/supervisord", "-c", "/etc/supervisord.conf"])
|
|
supervisord.wait()
|
|
except Exception:
|
|
logging.exception('failed!')
|