Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Revert "packages/cockroach: improve iam-database-restore script" #4446

Merged
merged 1 commit into from
Feb 13, 2019
Merged

Revert "packages/cockroach: improve iam-database-restore script" #4446

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 19 additions & 19 deletions packages/cockroach/extra/iam-database-restore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,32 +82,22 @@ def recover_database(my_internal_ip: str, backup_file_path: str, db_suffix: str)
log.error('Failed to load data into database `{}`.'.format(dbname))
raise

def _replace_database(source: str, existing: str, backup: str) -> None:
transaction = '; '.join([
'BEGIN',
'SAVEPOINT cockroach_restart',
# iam -> iam_old
'ALTER DATABASE {} RENAME TO {}'.format(existing, backup),
# iam_new -> iam
'ALTER DATABASE {} RENAME TO {}'.format(source, existing),
'RELEASE SAVEPOINT cockroach_restart',
'COMMIT',
])
def _rename_database(oldname: str, newname: str) -> None:
command = [
'/opt/mesosphere/active/cockroach/bin/cockroach',
'sql',
'--insecure',
'--host={}'.format(my_internal_ip),
'-e',
transaction,
'ALTER DATABASE {} RENAME to {}'.format(oldname, newname),
]
msg = 'Replace database `{}` to `{}` via command `{}`'.format(
source, existing, ' '.join(command))
msg = 'Rename database `{}` to `{}` via command `{}`'.format(
oldname, newname, ' '.join(command))
log.info(msg)
try:
subprocess.run(command, check=True)
except CalledProcessError:
log.error('Failed to replace database `{}` -> `{}`.'.format(source, existing))
log.error('Failed to rename database `{}` -> `{}`.'.format(oldname, newname))
raise

def _drop_database(dbname: str) -> None:
Expand Down Expand Up @@ -147,15 +137,25 @@ def recover_database(my_internal_ip: str, backup_file_path: str, db_suffix: str)
_drop_database(newdbname)
raise

# 3. In a single transaction replace original `iam` database with `iam_new`
# and keep original `iam` as `iam_old`.
# 3. Then rename the active `iam` database to `iam_old`.
try:
_replace_database(source=newdbname, existing=curdbname, backup=olddbname)
_rename_database(oldname=curdbname, newname=olddbname)
except CalledProcessError:
# Renaming the existing database failed, so remove the 'iam_new' database
_drop_database(newdbname)
raise

# 4. Remove the original (old) database that isn't used anymore
# 4. Finally, rename the `iam_new` database to `iam`.
try:
_rename_database(oldname=newdbname, newname=curdbname)
except CalledProcessError:
# Renaming the new database failed, so rename the old one back and
# remove the 'iam_new' database
_rename_database(oldname=olddbname, newname=curdbname)
_drop_database(newdbname)
raise

# 5. Remove the original (old) database that isn't used anymore
try:
_drop_database(olddbname)
except CalledProcessError:
Expand Down