zulip/scripts/lib/upgrade-zulip-from-git

203 lines
6.5 KiB
Plaintext
Raw Normal View History

#!/usr/bin/env python3
import argparse
import logging
import os
import subprocess
import sys
import time
LOCAL_GIT_CACHE_DIR = "/srv/zulip.git"
os.environ["PYTHONUNBUFFERED"] = "y"
sys.path.append(os.path.join(os.path.dirname(__file__), "..", ".."))
from scripts.lib.zulip_tools import (
DEPLOYMENTS_DIR,
assert_running_as_root,
get_config,
get_config_file,
get_deploy_options,
get_deploy_root,
get_deployment_lock,
make_deploy_path,
overwrite_symlink,
release_deployment_lock,
su_to_zulip,
)
config_file = get_config_file()
deploy_options = get_deploy_options(config_file)
remote_url = get_config(
config_file, "deployment", "git_repo_url", "https://github.com/zulip/zulip.git"
)
assert_running_as_root(strip_lib_from_paths=True)
# make sure we have appropriate file permissions
os.umask(0o22)
logging.Formatter.converter = time.gmtime
logging.basicConfig(format="%(asctime)s upgrade-zulip-from-git: %(message)s", level=logging.INFO)
parser = argparse.ArgumentParser()
parser.add_argument("refname", help="Git reference, e.g. a branch, tag, or commit ID.")
parser.add_argument(
"--remote-url", help="Override the Git remote URL configured in /etc/zulip/zulip.conf."
)
args, extra_options = parser.parse_known_args()
refname = args.refname
# Command line remote URL will be given preference above the one
# in /etc/zulip/zulip.conf.
if args.remote_url:
remote_url = args.remote_url
os.makedirs(DEPLOYMENTS_DIR, exist_ok=True)
error_rerun_script = f"{DEPLOYMENTS_DIR}/current/scripts/upgrade-zulip-from-git {refname}"
get_deployment_lock(error_rerun_script)
try:
deploy_path = make_deploy_path()
# Populate LOCAL_GIT_CACHE_DIR with both the requested remote and zulip/zulip.
if not os.path.exists(LOCAL_GIT_CACHE_DIR):
logging.info("Making local repository cache")
subprocess.check_call(
["git", "init", "--bare", "-q", LOCAL_GIT_CACHE_DIR],
stdout=subprocess.DEVNULL,
)
subprocess.check_call(
["git", "remote", "add", "origin", remote_url],
cwd=LOCAL_GIT_CACHE_DIR,
)
upgrade-zulip-from-git: Stop mirroring the remote. The local `/srv/zulip.git` directory has been cloned with `--mirror` since it was first created as a local cache in dc4b89fb085f. This made some sense at the time, since it was purely a cache of the remote, and not a home to local branches of its own. That changed in 3f83b843c24a, when we began using `git worktree`, which caused the `deployment-...` branches to begin being stored in `/src/zulip.git`. This caused intermixing of local and remote branches. When 02582c695603 landed, the addition of `--prune` caused all but the most recent deployment branch to be deleted upon every fetch -- leaving previous deployments with non-existent branches checked out: ``` zulip@example-prod-host:~/deployments/last$ git status On branch deployment-2022-04-15-23-07-55 No commits yet Changes to be committed: (use "git rm --cached <file>..." to unstage) new file: .browserslistrc new file: .codecov.yml new file: .codespellignore new file: .editorconfig [...snip list of every file in repo...] ``` Switch `/srv/zulip.git` to no longer be a `--mirror` cache of the origin. We reconfigure the remote to drop `remote.origin.mirror`, and delete all refs under `refs/pulls/` and `refs/heads/`, while preserving any checked-out branches. `refs/pulls/`, if the remote is the canonical upstream, contains _tens of thousands_ of refs, so pruning those refs trims off 20% of the repository size. Those savings require a `git gc --prune=now`, otherwise the dangling objects are ejected from the packfiles, which would balloon the repository up to more than three times its previous size. Repacking the repository is reasonable, in general, after removing such a large number of refs -- and the `--prune=now` is safe and will not lose data, as the `--mirror` was good at ensuring that the repository could not be used for any local state. The refname in the upgrade process was previously resolved from the union of local and remote refs, since they were in the same namespace. We instead now only resolve arguments as tags, then origin branches; this means that stale local branches will be skipped. Users who want to deploy from local branches can use `--remote-url=.`. Because the `scripts/lib/upgrade-zulip-from-git` file is "stage 1" and run from the old version's code, this will take two invocations of `upgrade-zulip-from-git` to take effect. Fixes #21901.
2022-05-12 22:45:18 +02:00
if os.stat(LOCAL_GIT_CACHE_DIR).st_uid == 0:
subprocess.check_call(["chown", "-R", "zulip:zulip", LOCAL_GIT_CACHE_DIR])
os.chdir(LOCAL_GIT_CACHE_DIR)
subprocess.check_call(
["git", "remote", "set-url", "origin", remote_url], preexec_fn=su_to_zulip
)
fetch_spec = subprocess.check_output(
["git", "config", "remote.origin.fetch"],
upgrade-zulip-from-git: Stop mirroring the remote. The local `/srv/zulip.git` directory has been cloned with `--mirror` since it was first created as a local cache in dc4b89fb085f. This made some sense at the time, since it was purely a cache of the remote, and not a home to local branches of its own. That changed in 3f83b843c24a, when we began using `git worktree`, which caused the `deployment-...` branches to begin being stored in `/src/zulip.git`. This caused intermixing of local and remote branches. When 02582c695603 landed, the addition of `--prune` caused all but the most recent deployment branch to be deleted upon every fetch -- leaving previous deployments with non-existent branches checked out: ``` zulip@example-prod-host:~/deployments/last$ git status On branch deployment-2022-04-15-23-07-55 No commits yet Changes to be committed: (use "git rm --cached <file>..." to unstage) new file: .browserslistrc new file: .codecov.yml new file: .codespellignore new file: .editorconfig [...snip list of every file in repo...] ``` Switch `/srv/zulip.git` to no longer be a `--mirror` cache of the origin. We reconfigure the remote to drop `remote.origin.mirror`, and delete all refs under `refs/pulls/` and `refs/heads/`, while preserving any checked-out branches. `refs/pulls/`, if the remote is the canonical upstream, contains _tens of thousands_ of refs, so pruning those refs trims off 20% of the repository size. Those savings require a `git gc --prune=now`, otherwise the dangling objects are ejected from the packfiles, which would balloon the repository up to more than three times its previous size. Repacking the repository is reasonable, in general, after removing such a large number of refs -- and the `--prune=now` is safe and will not lose data, as the `--mirror` was good at ensuring that the repository could not be used for any local state. The refname in the upgrade process was previously resolved from the union of local and remote refs, since they were in the same namespace. We instead now only resolve arguments as tags, then origin branches; this means that stale local branches will be skipped. Users who want to deploy from local branches can use `--remote-url=.`. Because the `scripts/lib/upgrade-zulip-from-git` file is "stage 1" and run from the old version's code, this will take two invocations of `upgrade-zulip-from-git` to take effect. Fixes #21901.
2022-05-12 22:45:18 +02:00
preexec_fn=su_to_zulip,
text=True,
).strip()
if fetch_spec in ("+refs/*:refs/*", "+refs/heads/*:refs/heads/*"):
# The refspec impinges on refs/heads/ -- this is an old mirror
# configuration.
logging.info("Cleaning up mirrored repository")
# remotes.origin.mirror may not be set -- we do not use
# check_call to ignore errors if it's already missing
subprocess.call(
upgrade-zulip-from-git: Stop mirroring the remote. The local `/srv/zulip.git` directory has been cloned with `--mirror` since it was first created as a local cache in dc4b89fb085f. This made some sense at the time, since it was purely a cache of the remote, and not a home to local branches of its own. That changed in 3f83b843c24a, when we began using `git worktree`, which caused the `deployment-...` branches to begin being stored in `/src/zulip.git`. This caused intermixing of local and remote branches. When 02582c695603 landed, the addition of `--prune` caused all but the most recent deployment branch to be deleted upon every fetch -- leaving previous deployments with non-existent branches checked out: ``` zulip@example-prod-host:~/deployments/last$ git status On branch deployment-2022-04-15-23-07-55 No commits yet Changes to be committed: (use "git rm --cached <file>..." to unstage) new file: .browserslistrc new file: .codecov.yml new file: .codespellignore new file: .editorconfig [...snip list of every file in repo...] ``` Switch `/srv/zulip.git` to no longer be a `--mirror` cache of the origin. We reconfigure the remote to drop `remote.origin.mirror`, and delete all refs under `refs/pulls/` and `refs/heads/`, while preserving any checked-out branches. `refs/pulls/`, if the remote is the canonical upstream, contains _tens of thousands_ of refs, so pruning those refs trims off 20% of the repository size. Those savings require a `git gc --prune=now`, otherwise the dangling objects are ejected from the packfiles, which would balloon the repository up to more than three times its previous size. Repacking the repository is reasonable, in general, after removing such a large number of refs -- and the `--prune=now` is safe and will not lose data, as the `--mirror` was good at ensuring that the repository could not be used for any local state. The refname in the upgrade process was previously resolved from the union of local and remote refs, since they were in the same namespace. We instead now only resolve arguments as tags, then origin branches; this means that stale local branches will be skipped. Users who want to deploy from local branches can use `--remote-url=.`. Because the `scripts/lib/upgrade-zulip-from-git` file is "stage 1" and run from the old version's code, this will take two invocations of `upgrade-zulip-from-git` to take effect. Fixes #21901.
2022-05-12 22:45:18 +02:00
["git", "config", "--unset", "remote.origin.mirror"],
preexec_fn=su_to_zulip,
)
subprocess.check_call(
["git", "config", "remote.origin.fetch", "+refs/heads/*:refs/remotes/origin/*"],
preexec_fn=su_to_zulip,
)
matching_refs = subprocess.check_output(
["git", "for-each-ref", "--format=%(refname)", "refs/pull/", "refs/heads/"],
preexec_fn=su_to_zulip,
text=True,
).splitlines()
# We can't use `git worktree list --porcelain -z` here because
# Ubuntu 20.04 Focal only has git 2.25.1, and -z was
# introduced in 2.36
worktree_data = subprocess.check_output(
["git", "worktree", "list", "--porcelain"],
preexec_fn=su_to_zulip,
text=True,
).splitlines()
keep_refs = set()
for worktree_line in worktree_data:
if worktree_line.startswith("branch "):
keep_refs.add(worktree_line[len("branch ") :])
delete_input = "".join(
f"delete {refname}\n" for refname in matching_refs if refname not in keep_refs
)
subprocess.run(
["git", "update-ref", "--stdin"],
check=True,
preexec_fn=su_to_zulip,
input=delete_input,
text=True,
)
logging.info("Repacking repository after pruning unnecessary refs...")
subprocess.check_call(
["git", "gc", "--prune=now"],
preexec_fn=su_to_zulip,
)
subprocess.check_call(
[os.path.join(get_deploy_root(), "scripts/lib/update-git-upstream")], preexec_fn=su_to_zulip
)
# Generate the deployment directory via git worktree from our local repository.
upgrade-zulip-from-git: Stop mirroring the remote. The local `/srv/zulip.git` directory has been cloned with `--mirror` since it was first created as a local cache in dc4b89fb085f. This made some sense at the time, since it was purely a cache of the remote, and not a home to local branches of its own. That changed in 3f83b843c24a, when we began using `git worktree`, which caused the `deployment-...` branches to begin being stored in `/src/zulip.git`. This caused intermixing of local and remote branches. When 02582c695603 landed, the addition of `--prune` caused all but the most recent deployment branch to be deleted upon every fetch -- leaving previous deployments with non-existent branches checked out: ``` zulip@example-prod-host:~/deployments/last$ git status On branch deployment-2022-04-15-23-07-55 No commits yet Changes to be committed: (use "git rm --cached <file>..." to unstage) new file: .browserslistrc new file: .codecov.yml new file: .codespellignore new file: .editorconfig [...snip list of every file in repo...] ``` Switch `/srv/zulip.git` to no longer be a `--mirror` cache of the origin. We reconfigure the remote to drop `remote.origin.mirror`, and delete all refs under `refs/pulls/` and `refs/heads/`, while preserving any checked-out branches. `refs/pulls/`, if the remote is the canonical upstream, contains _tens of thousands_ of refs, so pruning those refs trims off 20% of the repository size. Those savings require a `git gc --prune=now`, otherwise the dangling objects are ejected from the packfiles, which would balloon the repository up to more than three times its previous size. Repacking the repository is reasonable, in general, after removing such a large number of refs -- and the `--prune=now` is safe and will not lose data, as the `--mirror` was good at ensuring that the repository could not be used for any local state. The refname in the upgrade process was previously resolved from the union of local and remote refs, since they were in the same namespace. We instead now only resolve arguments as tags, then origin branches; this means that stale local branches will be skipped. Users who want to deploy from local branches can use `--remote-url=.`. Because the `scripts/lib/upgrade-zulip-from-git` file is "stage 1" and run from the old version's code, this will take two invocations of `upgrade-zulip-from-git` to take effect. Fixes #21901.
2022-05-12 22:45:18 +02:00
try:
fullref = f"refs/tags/{refname}"
commit_hash = subprocess.check_output(
["git", "rev-parse", "--verify", fullref],
preexec_fn=su_to_zulip,
text=True,
stderr=subprocess.DEVNULL,
).strip()
except subprocess.CalledProcessError as e:
if e.returncode == 128:
# Try in the origin namespace
fullref = f"refs/remotes/origin/{refname}"
commit_hash = subprocess.check_output(
["git", "rev-parse", "--verify", fullref],
preexec_fn=su_to_zulip,
text=True,
stderr=subprocess.DEVNULL,
).strip()
refname = fullref
subprocess.check_call(
["git", "worktree", "add", "--detach", deploy_path, refname],
stdout=subprocess.DEVNULL,
preexec_fn=su_to_zulip,
)
os.chdir(deploy_path)
upgrade-zulip-from-git: Stop mirroring the remote. The local `/srv/zulip.git` directory has been cloned with `--mirror` since it was first created as a local cache in dc4b89fb085f. This made some sense at the time, since it was purely a cache of the remote, and not a home to local branches of its own. That changed in 3f83b843c24a, when we began using `git worktree`, which caused the `deployment-...` branches to begin being stored in `/src/zulip.git`. This caused intermixing of local and remote branches. When 02582c695603 landed, the addition of `--prune` caused all but the most recent deployment branch to be deleted upon every fetch -- leaving previous deployments with non-existent branches checked out: ``` zulip@example-prod-host:~/deployments/last$ git status On branch deployment-2022-04-15-23-07-55 No commits yet Changes to be committed: (use "git rm --cached <file>..." to unstage) new file: .browserslistrc new file: .codecov.yml new file: .codespellignore new file: .editorconfig [...snip list of every file in repo...] ``` Switch `/srv/zulip.git` to no longer be a `--mirror` cache of the origin. We reconfigure the remote to drop `remote.origin.mirror`, and delete all refs under `refs/pulls/` and `refs/heads/`, while preserving any checked-out branches. `refs/pulls/`, if the remote is the canonical upstream, contains _tens of thousands_ of refs, so pruning those refs trims off 20% of the repository size. Those savings require a `git gc --prune=now`, otherwise the dangling objects are ejected from the packfiles, which would balloon the repository up to more than three times its previous size. Repacking the repository is reasonable, in general, after removing such a large number of refs -- and the `--prune=now` is safe and will not lose data, as the `--mirror` was good at ensuring that the repository could not be used for any local state. The refname in the upgrade process was previously resolved from the union of local and remote refs, since they were in the same namespace. We instead now only resolve arguments as tags, then origin branches; this means that stale local branches will be skipped. Users who want to deploy from local branches can use `--remote-url=.`. Because the `scripts/lib/upgrade-zulip-from-git` file is "stage 1" and run from the old version's code, this will take two invocations of `upgrade-zulip-from-git` to take effect. Fixes #21901.
2022-05-12 22:45:18 +02:00
extra_flags = []
if not refname.startswith("refs/tags/"):
extra_flags = ["-t"]
subprocess.check_call(
upgrade-zulip-from-git: Stop mirroring the remote. The local `/srv/zulip.git` directory has been cloned with `--mirror` since it was first created as a local cache in dc4b89fb085f. This made some sense at the time, since it was purely a cache of the remote, and not a home to local branches of its own. That changed in 3f83b843c24a, when we began using `git worktree`, which caused the `deployment-...` branches to begin being stored in `/src/zulip.git`. This caused intermixing of local and remote branches. When 02582c695603 landed, the addition of `--prune` caused all but the most recent deployment branch to be deleted upon every fetch -- leaving previous deployments with non-existent branches checked out: ``` zulip@example-prod-host:~/deployments/last$ git status On branch deployment-2022-04-15-23-07-55 No commits yet Changes to be committed: (use "git rm --cached <file>..." to unstage) new file: .browserslistrc new file: .codecov.yml new file: .codespellignore new file: .editorconfig [...snip list of every file in repo...] ``` Switch `/srv/zulip.git` to no longer be a `--mirror` cache of the origin. We reconfigure the remote to drop `remote.origin.mirror`, and delete all refs under `refs/pulls/` and `refs/heads/`, while preserving any checked-out branches. `refs/pulls/`, if the remote is the canonical upstream, contains _tens of thousands_ of refs, so pruning those refs trims off 20% of the repository size. Those savings require a `git gc --prune=now`, otherwise the dangling objects are ejected from the packfiles, which would balloon the repository up to more than three times its previous size. Repacking the repository is reasonable, in general, after removing such a large number of refs -- and the `--prune=now` is safe and will not lose data, as the `--mirror` was good at ensuring that the repository could not be used for any local state. The refname in the upgrade process was previously resolved from the union of local and remote refs, since they were in the same namespace. We instead now only resolve arguments as tags, then origin branches; this means that stale local branches will be skipped. Users who want to deploy from local branches can use `--remote-url=.`. Because the `scripts/lib/upgrade-zulip-from-git` file is "stage 1" and run from the old version's code, this will take two invocations of `upgrade-zulip-from-git` to take effect. Fixes #21901.
2022-05-12 22:45:18 +02:00
[
"git",
"checkout",
"-q",
*extra_flags,
"-b",
"deployment-" + os.path.basename(deploy_path),
refname,
],
preexec_fn=su_to_zulip,
)
overwrite_symlink("/etc/zulip/settings.py", "zproject/prod_settings.py")
overwrite_symlink(deploy_path, os.path.join(DEPLOYMENTS_DIR, "next"))
try:
subprocess.check_call(
[
os.path.join(deploy_path, "scripts", "lib", "upgrade-zulip-stage-2"),
deploy_path,
"--from-git",
*deploy_options,
*extra_options,
]
)
except subprocess.CalledProcessError:
# There's no use in showing a stacktrace here; it just hides
# the error from stage 2.
sys.exit(1)
finally:
release_deployment_lock()