summaryrefslogtreecommitdiffstats
path: root/geo-replication
diff options
context:
space:
mode:
Diffstat (limited to 'geo-replication')
-rw-r--r--geo-replication/src/gsyncd.c2
-rw-r--r--geo-replication/syncdaemon/README.md4
-rw-r--r--geo-replication/syncdaemon/configinterface.py.in2
-rw-r--r--geo-replication/syncdaemon/master.py12
-rw-r--r--geo-replication/syncdaemon/monitor.py2
-rw-r--r--geo-replication/syncdaemon/resource.py4
-rw-r--r--geo-replication/syncdaemon/syncdutils.py2
7 files changed, 14 insertions, 14 deletions
diff --git a/geo-replication/src/gsyncd.c b/geo-replication/src/gsyncd.c
index 11599760457..ce900b0a3e4 100644
--- a/geo-replication/src/gsyncd.c
+++ b/geo-replication/src/gsyncd.c
@@ -370,7 +370,7 @@ main (int argc, char **argv)
evas = getenv (_GLUSTERD_CALLED_);
if (evas && strcmp (evas, "1") == 0)
/* OK, we know glusterd called us, no need to look for further config
- * ... altough this conclusion should not inherit to our children
+ *...although this conclusion should not inherit to our children
*/
unsetenv (_GLUSTERD_CALLED_);
else {
diff --git a/geo-replication/syncdaemon/README.md b/geo-replication/syncdaemon/README.md
index 67f346ace5a..2a202e3f99e 100644
--- a/geo-replication/syncdaemon/README.md
+++ b/geo-replication/syncdaemon/README.md
@@ -12,7 +12,7 @@ Requirements are categorized according to this.
* OpenSSH >= 4.0 (master) / SSH2 compliant sshd (eg. openssh) (slave)
* rsync (both)
* glusterfs: with marker and changelog support (master & slave);
-* FUSE: glusterfs fuse module with auxilary gfid based access support
+* FUSE: glusterfs fuse module with auxiliary gfid based access support
INSTALLATION
------------
@@ -45,7 +45,7 @@ in the source tree.
USAGE
-----
-gsyncd is a utilitly for continous mirroring, ie. it mirrors master to slave incrementally.
+gsyncd is a utilitly for continuous mirroring, ie. it mirrors master to slave incrementally.
Assume we have a gluster volume _pop_ at localhost. We try to set up the mirroring for volume
_pop_ using gsyncd for gluster volume _moz_ on remote machine/cluster @ example.com. The
respective gsyncd invocations are (demoing some syntax sugaring):
diff --git a/geo-replication/syncdaemon/configinterface.py.in b/geo-replication/syncdaemon/configinterface.py.in
index acb51486a10..0ffff70e0bb 100644
--- a/geo-replication/syncdaemon/configinterface.py.in
+++ b/geo-replication/syncdaemon/configinterface.py.in
@@ -95,7 +95,7 @@ def upgrade_config_file(path):
# If src and dst are two different file system, then os.rename
# fails, In this case if temp file created in /tmp and if /tmp is
- # seperate fs then os.rename gives following error, so use shutil
+ # separate fs then os.rename gives following error, so use shutil
# OSError: [Errno 18] Invalid cross-device link
# mail.python.org/pipermail/python-list/2005-February/342893.html
shutil.move(tempConfigFile.name, path)
diff --git a/geo-replication/syncdaemon/master.py b/geo-replication/syncdaemon/master.py
index 138e7e475b8..6f1b639e566 100644
--- a/geo-replication/syncdaemon/master.py
+++ b/geo-replication/syncdaemon/master.py
@@ -478,7 +478,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 beacuse the slave's xtime is now
+ # propogated). 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.
@@ -717,7 +717,7 @@ class GMasterCommon(object):
"""perform jobs registered for @path
Reset jobtab entry for @path,
- determine success as the conjuction of
+ determine success as the conjunction of
success of all the jobs. In case of
success, call .sendmark on @path
"""
@@ -766,7 +766,7 @@ class GMasterChangelogMixin(GMasterCommon):
TYPE_GFID = "D "
TYPE_ENTRY = "E "
- # flat directory heirarchy for gfid based access
+ # flat directory hierarchy for gfid based access
FLAT_DIR_HIERARCHY = '.'
# maximum retries per changelog before giving up
@@ -979,7 +979,7 @@ class GMasterChangelogMixin(GMasterCommon):
# update the slave's time with the timestamp of the _last_
# changelog file time suffix. Since, the changelog prefix time
# is the time when the changelog was rolled over, introduce a
- # tolerence of 1 second to counter the small delta b/w the
+ # tolerance of 1 second to counter the small delta b/w the
# marker update and gettimeofday().
# NOTE: this is only for changelog mode, not xsync.
@@ -1297,7 +1297,7 @@ class GMasterXsyncMixin(GMasterChangelogMixin):
"""
This crawl needs to be xtime based (as of now
- it's not. this is beacuse we generate CHANGELOG
+ it's not. this is because we generate CHANGELOG
file during each crawl which is then processed
by process_change()).
For now it's used as a one-shot initial sync
@@ -1329,7 +1329,7 @@ class GMasterXsyncMixin(GMasterChangelogMixin):
event dispatcher thread
this thread dispatches either changelog or synchronizes stime.
- additionally terminates itself on recieving a 'finale' event
+ additionally terminates itself on receiving a 'finale' event
"""
def Xsyncer():
self.Xcrawl()
diff --git a/geo-replication/syncdaemon/monitor.py b/geo-replication/syncdaemon/monitor.py
index ee3c91f3e9f..5e0698b8c46 100644
--- a/geo-replication/syncdaemon/monitor.py
+++ b/geo-replication/syncdaemon/monitor.py
@@ -356,7 +356,7 @@ def distribute(*resources):
slave_host = slave.remote_addr.split('@')[-1]
slave_vol = si.volume
else:
- raise GsyncdError("unkown slave type " + slave.url)
+ raise GsyncdError("unknown slave type " + slave.url)
logging.info('slave bricks: ' + repr(sbricks))
if isinstance(si, FILE):
slaves = [slave.url]
diff --git a/geo-replication/syncdaemon/resource.py b/geo-replication/syncdaemon/resource.py
index c20a243352b..0e0dd88eff8 100644
--- a/geo-replication/syncdaemon/resource.py
+++ b/geo-replication/syncdaemon/resource.py
@@ -845,8 +845,8 @@ class SlaveRemote(object):
def tarssh(self, files, slaveurl):
"""invoke tar+ssh
- -z (compress) can be use if needed, but ommitting it now
- as it results in wierd error (tar+ssh errors out (errcode: 2)
+ -z (compress) can be use if needed, but omitting it now
+ as it results in weird error (tar+ssh errors out (errcode: 2)
"""
if not files:
raise GsyncdError("no files to sync")
diff --git a/geo-replication/syncdaemon/syncdutils.py b/geo-replication/syncdaemon/syncdutils.py
index 9eda6044472..23db55e2e80 100644
--- a/geo-replication/syncdaemon/syncdutils.py
+++ b/geo-replication/syncdaemon/syncdutils.py
@@ -43,7 +43,7 @@ except ImportError:
# py 2.4
from md5 import new as md5
-# auxillary gfid based access prefix
+# auxiliary gfid based access prefix
_CL_AUX_GFID_PFX = ".gfid/"
GF_OP_RETRIES = 20