mirror of https://github.com/zulip/zulip.git
upgrade: Check with zulip-puppet-apply to see if we can skip it.
This commit is contained in:
parent
ecfc23bd0b
commit
2e5a079ef4
|
@ -342,6 +342,19 @@ elif not args.skip_migrations:
|
||||||
if not migrations_needed:
|
if not migrations_needed:
|
||||||
subprocess.check_call(["./manage.py", "fill_memcached_caches"], preexec_fn=su_to_zulip)
|
subprocess.check_call(["./manage.py", "fill_memcached_caches"], preexec_fn=su_to_zulip)
|
||||||
|
|
||||||
|
# If we are planning on running puppet, we can pre-run it in --noop
|
||||||
|
# mode and see if it will actually make any changes; if not, we can
|
||||||
|
# skip it during the upgrade. We omit this check if the server is
|
||||||
|
# already stopped, since it's not better than just pressing on.
|
||||||
|
if not args.skip_puppet and IS_SERVER_UP:
|
||||||
|
logging.info("Pre-checking for puppet changes...")
|
||||||
|
try_puppet = subprocess.run(
|
||||||
|
["./scripts/zulip-puppet-apply", "--noop", "--force"], stdout=subprocess.DEVNULL
|
||||||
|
)
|
||||||
|
if try_puppet.returncode == 0:
|
||||||
|
logging.info("No puppet changes found, skipping!")
|
||||||
|
args.skip_puppet = True
|
||||||
|
|
||||||
# NOTE: Here begins the most likely critical period, where we may be
|
# NOTE: Here begins the most likely critical period, where we may be
|
||||||
# shutting down the server; we should strive to minimize the number of
|
# shutting down the server; we should strive to minimize the number of
|
||||||
# steps that happen between here and the "Restarting Zulip" line
|
# steps that happen between here and the "Restarting Zulip" line
|
||||||
|
|
Loading…
Reference in New Issue