summaryrefslogtreecommitdiffstats
path: root/geo-replication
diff options
context:
space:
mode:
authorYaniv Kaul <ykaul@redhat.com>2018-07-16 17:03:17 +0300
committerAmar Tumballi <amarts@redhat.com>2018-07-22 14:40:16 +0000
commit621138ce763eda8270d0a4f6d7209fd50ada8787 (patch)
tree7299759993f6e9f7f34dad95fc8d8cd6ffc1b2fd /geo-replication
parentc0e76377d0fc47aa66f35ea70a4793731ebbd40c (diff)
All: run codespell on the code and fix issues.
Please review, it's not always just the comments that were fixed. I've had to revert of course all calls to creat() that were changed to create() ... Only compile-tested! Change-Id: I7d02e82d9766e272a7fd9cc68e51901d69e5aab5 updates: bz#1193929 Signed-off-by: Yaniv Kaul <ykaul@redhat.com>
Diffstat (limited to 'geo-replication')
-rw-r--r--geo-replication/syncdaemon/gsyncdconfig.py2
-rw-r--r--geo-replication/syncdaemon/libcxattr.py2
-rw-r--r--geo-replication/syncdaemon/master.py10
-rw-r--r--geo-replication/syncdaemon/monitor.py2
-rw-r--r--geo-replication/syncdaemon/repce.py2
-rw-r--r--geo-replication/syncdaemon/resource.py4
-rw-r--r--geo-replication/syncdaemon/syncdutils.py2
7 files changed, 13 insertions, 11 deletions
diff --git a/geo-replication/syncdaemon/gsyncdconfig.py b/geo-replication/syncdaemon/gsyncdconfig.py
index b2517f031ca..86b942d6dc9 100644
--- a/geo-replication/syncdaemon/gsyncdconfig.py
+++ b/geo-replication/syncdaemon/gsyncdconfig.py
@@ -50,7 +50,7 @@ class Gconf(object):
self.args = args
self.extra_tmpl_args = extra_tmpl_args
self.override_from_args = override_from_args
- # Store default values only if overwriten, Only for JSON/CLI output
+ # Store default values only if overwritten, Only for JSON/CLI output
self.default_values = {}
self._load()
diff --git a/geo-replication/syncdaemon/libcxattr.py b/geo-replication/syncdaemon/libcxattr.py
index f576648b7a8..2d186b95c89 100644
--- a/geo-replication/syncdaemon/libcxattr.py
+++ b/geo-replication/syncdaemon/libcxattr.py
@@ -14,7 +14,7 @@ from ctypes import CDLL, create_string_buffer, get_errno
class Xattr(object):
- """singleton that wraps the extended attribues system
+ """singleton that wraps the extended attributes system
interface for python using ctypes
Just implement it to the degree we need it, in particular
diff --git a/geo-replication/syncdaemon/master.py b/geo-replication/syncdaemon/master.py
index 665a51f64dd..ac31e3fb81a 100644
--- a/geo-replication/syncdaemon/master.py
+++ b/geo-replication/syncdaemon/master.py
@@ -192,7 +192,7 @@ class NormalMixin(object):
vi = vi.copy()
vi['timeout'] = int(time.time()) + timo
else:
- # send keep-alives more frequently to
+ # send keep-alive more frequently to
# avoid a delay in announcing our volume info
# to slave if it becomes established in the
# meantime
@@ -529,7 +529,7 @@ class GMasterCommon(object):
# If crawlwrap is called when partial history available,
# then it sets register_time which is the time when geo-rep
- # worker registerd to changelog consumption. Since nsec is
+ # worker registered to changelog consumption. Since nsec is
# not considered in register time, their are chances of skipping
# changes detection in xsync crawl. This limit will be reset when
# crawlwrap is called again.
@@ -540,7 +540,7 @@ class GMasterCommon(object):
# no need to maintain volinfo state machine.
# in a cascading setup, each geo-replication session is
# independent (ie. 'volume-mark' and 'xtime' are not
- # propogated). This is because the slave's xtime is now
+ # propagated). This is because the slave's xtime is now
# stored on the master itself. 'volume-mark' just identifies
# that we are in a cascading setup and need to enable
# 'geo-replication.ignore-pid-check' option.
@@ -919,6 +919,8 @@ class GMasterChangelogMixin(GMasterCommon):
if fix_entry_ops:
# Process deletions of entries whose gfids are mismatched
failures1 = self.slave.server.entry_ops(fix_entry_ops)
+ if not failures1:
+ logging.info("Successfully fixed entry ops with gfid mismatch")
return (failures1, fix_entry_ops)
@@ -1563,7 +1565,7 @@ class GMasterChangeloghistoryMixin(GMasterChangelogMixin):
self.history_crawl_start_time = int(time.time())
self.crawl()
else:
- # This exeption will be catched in resource.py and
+ # This exception will be caught in resource.py and
# fallback to xsync for the small gap.
raise PartialHistoryAvailable(str(actual_end))
diff --git a/geo-replication/syncdaemon/monitor.py b/geo-replication/syncdaemon/monitor.py
index 40818427bfe..52ae256fb14 100644
--- a/geo-replication/syncdaemon/monitor.py
+++ b/geo-replication/syncdaemon/monitor.py
@@ -126,7 +126,7 @@ class Monitor(object):
raise
def exit_signalled(s):
- """ child teminated due to receipt of SIGUSR1 """
+ """ child terminated due to receipt of SIGUSR1 """
return (os.WIFSIGNALED(s) and (os.WTERMSIG(s) == signal.SIGUSR1))
def exit_status(s):
diff --git a/geo-replication/syncdaemon/repce.py b/geo-replication/syncdaemon/repce.py
index 9d5da666858..6910fd068ad 100644
--- a/geo-replication/syncdaemon/repce.py
+++ b/geo-replication/syncdaemon/repce.py
@@ -193,7 +193,7 @@ class RepceClient(object):
"""RePCe client is callabe, calling it implements a synchronous
remote call.
- We do a .push with a cbk which does a wakeup upon receiving anwser,
+ We do a .push with a cbk which does a wakeup upon receiving answer,
then wait on the RepceJob.
"""
rjob = self.push(
diff --git a/geo-replication/syncdaemon/resource.py b/geo-replication/syncdaemon/resource.py
index 43e82f30d28..df4006f971a 100644
--- a/geo-replication/syncdaemon/resource.py
+++ b/geo-replication/syncdaemon/resource.py
@@ -638,7 +638,7 @@ class Server(object):
# So both validations are necessary to decide src doesn't
# exist. We can't rely on only gfid stat as hardlink could
# be present and we can't rely only on name as name could
- # exist with differnt gfid.
+ # exist with different gfid.
if not matching_disk_gfid(gfid, entry):
if e['stat'] and not stat.S_ISDIR(e['stat']['mode']):
if stat.S_ISLNK(e['stat']['mode']) and \
@@ -1400,7 +1400,7 @@ class SSH(object):
'--local-node-id', rconf.args.resource_remote_id] + \
[
# Add all config arguments here, slave gsyncd will not use
- # config file in slave side, so all overridding options should
+ # config file in slave side, so all overriding options should
# be sent as arguments
'--slave-timeout', str(gconf.get("slave-timeout")),
'--slave-log-level', gconf.get("slave-log-level"),
diff --git a/geo-replication/syncdaemon/syncdutils.py b/geo-replication/syncdaemon/syncdutils.py
index f7173017e5d..93e09756198 100644
--- a/geo-replication/syncdaemon/syncdutils.py
+++ b/geo-replication/syncdaemon/syncdutils.py
@@ -935,7 +935,7 @@ class VolinfoFromGconf(object):
# Glusterd will generate following config items before Geo-rep start
# So that Geo-rep need not run gluster commands from inside
# Volinfo object API/interface kept as is so that caller need not
- # change anything exept calling this instead of Volinfo()
+ # change anything except calling this instead of Volinfo()
#
# master-bricks=
# master-bricks=NODEID:HOSTNAME:PATH,..