xgiovio/openstack-swift-backup-restore-tool
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

return false instead of exiting in some functions. Added modification to split for md5

Browse Source
This commit is contained in:
Giovanni Di Grezia
2018-05-15 21:16:56 +02:00
parent 40753a8b96
commit 438a248c49
5 changed files with 43 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
local_to_swift.py
View File

@@ -38,7 +38,10 @@ def launch(localpath,temp_dir,swift_container,prefix,size_limit_to_segment,size_
#checks
utility.check_segments_size (size_limit_reading_os,size_limit_to_segment)
if not utility.check_segments_size (size_limit_reading_os,size_limit_to_segment)
print ("Error size segments")
sys.exit(-2)
if utility.check_start_slash(swift_container) or utility.check_start_slash(prefix) or not utility.check_end_slash(localpath) or not utility.check_end_slash(temp_dir) or utility.check_end_slash(swift_container) or not utility.check_end_slash(prefix):
print ("Errors on local or remote paths. Checks \\ or / at the begin or end of each path")
sys.exit(-2)
@@ -46,8 +49,14 @@ def launch(localpath,temp_dir,swift_container,prefix,size_limit_to_segment,size_
print ("Files locali " + str(len(localfiles)))
print("___________")
swift_conn = authentication.set_authentication ()
swift_conn,objects = utility.get_list(fail_tries,swift_conn,swift_container,prefix)
byte0real,byte0manifest,swift_conn,remotefiles,remotefiles_md5,remotefiles_xobj = utility.list_compute_correct_size (fail_tries,objects,swift_conn,swift_container,prefix)
results = utility.get_list(fail_tries,swift_conn,swift_container,prefix)
if not results:
return
swift_conn,objects = results
results = utility.list_compute_correct_size (fail_tries,objects,swift_conn,swift_container,prefix)
if not results:
return
byte0real,byte0manifest,swift_conn,remotefiles,remotefiles_md5,remotefiles_xobj = results
if encrypted:
remotefiles_encr,list_enc_old = utility.list_compute_correct_names_for_encryption(objects,prefix)
@@ -326,7 +335,10 @@ def launch(localpath,temp_dir,swift_container,prefix,size_limit_to_segment,size_
print("Computing deletion list...")
if encrypted:
#update remote list with new files encrypted
swift_conn,objects = utility.get_list(fail_tries,swift_conn,swift_container,prefix)
results = utility.get_list(fail_tries,swift_conn,swift_container,prefix)
if not results:
return
swift_conn,objects = results
remotefiles_encr,list_enc_old = utility.list_compute_correct_names_for_encryption(objects,prefix)
for o in list_enc_old: