andy/glusterfs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

python3: Fix python3 compatibility

Browse Source 
Updates: #411
Change-Id: I7c1eaa92cd4ac05c3667b760e0db2cddcfbbaed8
Signed-off-by: Nigel Babu <nigelb@redhat.com>
This commit is contained in:
Nigel Babu 2018-09-14 19:06:41 +05:30 committed by Amar Tumballi
parent b7732b9c06
commit 8297b909ab
4 changed files with 49 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
extras/create_new_xlator/generate_xlator.py
View File

@ -113,7 +113,7 @@ def gen_xlator():
xlator_methods = fragments["XLATOR_METHODS"].replace("@XL_NAME@", xl_name)
xlator_methods = xlator_methods.replace("@FOP_PREFIX@", fop_prefix)
print(xlator_methods, file=xl)
print(xlator_methods, file=xl)
xl.close()

7
extras/rebalance.py
View File

@ -1,6 +1,7 @@
#!/usr/bin/python3
from __future__ import print_function
import atexit
import copy
import optparse
@ -155,8 +156,8 @@ def get_score (bricks):
if __name__ == "__main__":
my_usage = "%prog [options] server volume [directory]"
parser = optparse.OptionParser(usage=my_usage)
my_usage = "%prog [options] server volume [directory]"
parser = optparse.OptionParser(usage=my_usage)
parser.add_option("-f", "--free-space", dest="free_space",
default=False, action="store_true",
help="use free space instead of total space")
@ -166,7 +167,7 @@ if __name__ == "__main__":
parser.add_option("-v", "--verbose", dest="verbose",
default=False, action="store_true",
help="verbose output")
options, args = parser.parse_args()
options, args = parser.parse_args()
if len(args) == 3:
fix_dir = args[2]

20
extras/snap_scheduler/gcron.py
View File

@ -105,11 +105,11 @@ def doJob(name, lockFile, jobFunc, volname):
else:
log.info("Job %s has been processed already", name)
fcntl.flock(f, fcntl.LOCK_UN)
except (OSError, IOError) as (errno, strerror):
except (OSError, IOError):
log.info("Job %s is being processed by another agent", name)
os.close(f)
except (OSError, IOError) as (errno, strerror):
log.debug("Failed to open lock file %s : %s", lockFile, strerror)
except (OSError, IOError) as e:
log.debug("Failed to open lock file %s : %s", lockFile, e)
log.error("Failed to process job %s", name)
success = False
@ -130,12 +130,12 @@ def main():
f = os.open(GCRON_RELOAD_FLAG,
os.O_CREAT | os.O_NONBLOCK, 0o644)
os.close(f)
except OSError as (errno, strerror):
except OSError as e:
if errno != EEXIST:
log.error("Failed to create %s : %s",
GCRON_RELOAD_FLAG, strerror)
GCRON_RELOAD_FLAG, e)
output("Failed to create %s. Error: %s"
% (GCRON_RELOAD_FLAG, strerror))
% (GCRON_RELOAD_FLAG, e))
return
if not os.path.exists(GCRON_CROND_TASK):
@ -154,9 +154,9 @@ def main():
if process.returncode != 0:
log.error("Failed to touch %s. Error: %s.",
GCRON_CROND_TASK, err)
except (IOError, OSError) as (errno, strerror):
except (IOError, OSError) as e:
log.error("Failed to touch %s. Error: %s.",
GCRON_CROND_TASK, strerror)
GCRON_CROND_TASK, e)
return
if os.lstat(GCRON_TASKS).st_mtime > \
os.lstat(GCRON_CROND_TASK).st_mtime:
@ -168,9 +168,9 @@ def main():
if process.returncode != 0:
log.error("Failed to touch %s. Error: %s.",
GCRON_CROND_TASK, err)
except IOError as (errno, strerror):
except IOError as e:
log.error("Failed to touch %s. Error: %s.",
GCRON_CROND_TASK, strerror)
GCRON_CROND_TASK, e)
return
volname = sys.argv[1]

66
extras/snap_scheduler/snap_scheduler.py
View File

@ -209,9 +209,9 @@ def enable_scheduler():
f = os.open(GCRON_ENABLED, os.O_CREAT | os.O_NONBLOCK,
0o644)
os.close(f)
except OSError as (errno, strerror):
except OSError as e:
log.error("Failed to open %s. Error: %s.",
GCRON_ENABLED, strerror)
GCRON_ENABLED, e)
ret = INTERNAL_ERROR
return ret
os.symlink(GCRON_ENABLED, GCRON_TASKS)
@ -219,8 +219,9 @@ def enable_scheduler():
log.info("Snapshot scheduling is enabled")
output("Snapshot scheduling is enabled")
ret = 0
except OSError as (errno, strerror):
print_str = "Failed to enable snapshot scheduling. Error: "+strerror
except OSError as e:
print_str = ("Failed to enable snapshot scheduling."
"Error: {{}}" + e)
log.error(print_str)
output(print_str)
ret = INTERNAL_ERROR
@ -268,8 +269,9 @@ def disable_scheduler():
log.info("Snapshot scheduling is disabled")
output("Snapshot scheduling is disabled")
ret = 0
except OSError as (errno, strerror):
print_str = "Failed to disable snapshot scheduling. Error: "+strerror
except OSError as e:
print_str = ("Failed to disable snapshot scheduling. Error: "
+ e)
log.error(print_str)
output(print_str)
ret = INTERNAL_ERROR
@ -308,8 +310,8 @@ def load_tasks_from_file():
tasks[jobname] = schedule+":"+volname
f.close()
ret = 0
except IOError as (errno, strerror):
log.error("Failed to open %s. Error: %s.", GCRON_ENABLED, strerror)
except IOError as e:
log.error("Failed to open %s. Error: %s.", GCRON_ENABLED, e)
ret = INTERNAL_ERROR
return ret
@ -322,8 +324,8 @@ def get_current_scheduler():
current_scheduler = f.readline().rstrip('\n')
f.close()
ret = 0
except IOError as (errno, strerror):
log.error("Failed to open %s. Error: %s.", CURRENT_SCHEDULER, strerror)
except IOError as e:
log.error("Failed to open %s. Error: %s.", CURRENT_SCHEDULER, e)
ret = INTERNAL_ERROR
return ret
@ -376,8 +378,8 @@ def write_tasks_to_file():
f.flush()
os.fsync(f.fileno())
f.close()
except IOError as (errno, strerror):
log.error("Failed to open %s. Error: %s.", TMP_FILE, strerror)
except IOError as e:
log.error("Failed to open %s. Error: %s.", TMP_FILE, e)
ret = INTERNAL_ERROR
return ret
@ -393,8 +395,8 @@ def update_current_scheduler(data):
f.flush()
os.fsync(f.fileno())
f.close()
except IOError as (errno, strerror):
log.error("Failed to open %s. Error: %s.", TMP_FILE, strerror)
except IOError as e:
log.error("Failed to open %s. Error: %s.", TMP_FILE, e)
ret = INTERNAL_ERROR
return ret
@ -459,9 +461,9 @@ def add_schedules(jobname, schedule, volname):
f = os.open(job_lockfile, os.O_CREAT | os.O_NONBLOCK,
0o644)
os.close(f)
except OSError as (errno, strerror):
except OSError as e:
log.error("Failed to open %s. Error: %s.",
job_lockfile, strerror)
job_lockfile, e)
ret = INTERNAL_ERROR
return ret
log.info("Successfully added snapshot schedule %s" %
@ -489,9 +491,9 @@ def delete_schedules(jobname):
job_lockfile = LOCK_FILE_DIR+jobname
try:
os.remove(job_lockfile)
except OSError as (errno, strerror):
except OSError as e:
log.error("Failed to open %s. Error: %s.",
job_lockfile, strerror)
job_lockfile, e)
ret = INTERNAL_ERROR
return ret
log.info("Successfully deleted snapshot schedule %s"
@ -650,8 +652,8 @@ def initialise_scheduler():
f.flush()
os.fsync(f.fileno())
f.close()
except IOError as (errno, strerror):
log.error("Failed to open %s. Error: %s.", TMP_FILE, strerror)
except IOError as e:
log.error("Failed to open %s. Error: %s.", TMP_FILE, e)
ret = INIT_FAILED
return ret
@ -661,8 +663,8 @@ def initialise_scheduler():
try:
f = open(GCRON_TASKS, "w", 0o644)
f.close()
except IOError as (errno, strerror):
log.error("Failed to open %s. Error: %s.", GCRON_TASKS, strerror)
except IOError as e:
log.error("Failed to open %s. Error: %s.", GCRON_TASKS, e)
ret = INIT_FAILED
return ret
@ -894,11 +896,11 @@ def main(argv):
if not os.path.exists(SHARED_STORAGE_DIR+"/snaps/"):
try:
os.makedirs(SHARED_STORAGE_DIR+"/snaps/")
except OSError as (errno, strerror):
except OSError as e:
if errno != EEXIST:
log.error("Failed to create %s : %s", SHARED_STORAGE_DIR+"/snaps/", strerror)
log.error("Failed to create %s : %s", SHARED_STORAGE_DIR+"/snaps/", e)
output("Failed to create %s. Error: %s"
% (SHARED_STORAGE_DIR+"/snaps/", strerror))
% (SHARED_STORAGE_DIR+"/snaps/", e))
return INTERNAL_ERROR
if not os.path.exists(GCRON_ENABLED):
@ -908,11 +910,11 @@ def main(argv):
if not os.path.exists(LOCK_FILE_DIR):
try:
os.makedirs(LOCK_FILE_DIR)
except OSError as (errno, strerror):
except OSError as e:
if errno != EEXIST:
log.error("Failed to create %s : %s", LOCK_FILE_DIR, strerror)
log.error("Failed to create %s : %s", LOCK_FILE_DIR, e)
output("Failed to create %s. Error: %s"
% (LOCK_FILE_DIR, strerror))
% (LOCK_FILE_DIR, e))
return INTERNAL_ERROR
try:
@ -921,15 +923,15 @@ def main(argv):
fcntl.flock(f, fcntl.LOCK_EX | fcntl.LOCK_NB)
ret = perform_operation(args)
fcntl.flock(f, fcntl.LOCK_UN)
except IOError as (errno, strerror):
except IOError:
log.info("%s is being processed by another agent.", LOCK_FILE)
output("Another snap_scheduler command is running. "
"Please try again after some time.")
return ANOTHER_TRANSACTION_IN_PROGRESS
os.close(f)
except OSError as (errno, strerror):
log.error("Failed to open %s : %s", LOCK_FILE, strerror)
output("Failed to open %s. Error: %s" % (LOCK_FILE, strerror))
except OSError as e:
log.error("Failed to open %s : %s", LOCK_FILE, e)
output("Failed to open %s. Error: %s" % (LOCK_FILE, e))
return INTERNAL_ERROR
return ret