Skip to content

sstableloader to use locally configured fqdn when set #149

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

sstableloader to use locally configured fqdn when set #149

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
8 changes: 4 additions & 4 deletions medusa/restore_node.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,13 +149,13 @@ def restore_node_sstableloader(config, temp_dir, backup_name, in_place, keep_aut
download_dir = temp_dir / 'medusa-restore-{}'.format(uuid.uuid4())
logging.info('Downloading data from backup to {}'.format(download_dir))
download_data(config.storage, node_backup, fqtns_to_restore, destination=download_dir)
invoke_sstableloader(config, download_dir, keep_auth, fqtns_to_restore, cassandra.storage_port)
invoke_sstableloader(config, download_dir, keep_auth, fqtns_to_restore, cassandra.storage_port, fqdn)
logging.info('Finished loading backup from {}'.format(fqdn))

return node_backup


def invoke_sstableloader(config, download_dir, keep_auth, fqtns_to_restore, storage_port):
def invoke_sstableloader(config, download_dir, keep_auth, fqtns_to_restore, storage_port, fqdn):
cassandra_is_ccm = int(shlex.split(config.cassandra.is_ccm)[0])
keyspaces = os.listdir(str(download_dir))
for keyspace in keyspaces:
Expand All @@ -169,8 +169,8 @@ def invoke_sstableloader(config, download_dir, keep_auth, fqtns_to_restore, stor
cql_username = 'foo' if config.cassandra.cql_username is None else config.cassandra.cql_username
cql_password = 'foo' if config.cassandra.cql_password is None else config.cassandra.cql_password
sstableloader_args = [config.cassandra.sstableloader_bin,
'-d', socket.getfqdn() if cassandra_is_ccm == 0
else '127.0.0.1',
'-d', socket.getfqdn() if cassandra_is_ccm == 0 and fqdn is None
else fqdn if fqdn is not None else '127.0.0.1',
'--username', cql_username,
'--password', cql_password,
'--no-progress',
Expand Down