summaryrefslogtreecommitdiffstats
path: root/xlators/features/marker/utils
Commit message (Collapse)AuthorAgeFilesLines
* gsyncd: do some basic sanitization on logsCsaba Henk2011-07-295-24/+60
| | | | | | | | | | | | - exceptions raised by us will be logged as single-line error messages (full stack strace is shown only at DEBUG loglevel) - common/well understood exceptions are mapped to "user-parsable" error logs Change-Id: I75f1fb848483372364b2093878d9cfed576c9739 BUG: 2778 Reviewed-on: http://review.gluster.com/125 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Anand Avati <avati@gluster.com>
* geo-rep: minor fixesCsaba Henk2011-07-291-1/+1
| | | | | | | | Change-Id: I5c5211858bdb2bd28324818362d95edd97f94207 BUG: 2778 Reviewed-on: http://review.gluster.com/81 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Kaushik BV <kaushikbv@gluster.com>
* gsyncd: exit in slave when RePCe session came to an endCsaba Henk2011-07-281-1/+2
| | | | | | | | Change-Id: I4317e60fce3280c45dbcc4a5f233a4344aba9500 BUG: 2778 Reviewed-on: http://review.gluster.com/83 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Anand Avati <avati@gluster.com>
* gsyncd: log exit properlyCsaba Henk2011-07-283-2/+4
| | | | | | | | Change-Id: Iedd8c0ce9dec2d8dcb01e0e5b409cb53185b1716 BUG: 2778 Reviewed-on: http://review.gluster.com/82 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Kaushik BV <kaushikbv@gluster.com>
* geo-rep: compactify loggingCsaba Henk2011-07-281-14/+40
| | | | | | | | Change-Id: I19f6cf539289062b39e3c0f73fa88f4ff9488349 BUG: 2778 Reviewed-on: http://review.gluster.com/80 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Kaushik BV <kaushikbv@gluster.com>
* Revert "temporary workaround for mtab update race thingy"Csaba Henk2011-05-261-1/+0
| | | | | | | | | | | | | | | | This reverts commit 59b9ab45a01d52e197ab6f76fd71e64910396d57. [c5d781e0 made this temporary workaround unnecessary] Conflicts: xlators/features/marker/utils/syncdaemon/resource.py Signed-off-by: Csaba Henk <csaba@gluster.com> Signed-off-by: Anand Avati <avati@gluster.com> BUG: 2690 (race between mtab updates of mount and umount) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=2690
* syncdaemon: fix listing xattrs when there is none and failure handlingCsaba Henk2011-05-091-5/+4
| | | | | | | | Signed-off-by: Csaba Henk <csaba@gluster.com> Signed-off-by: Anand Avati <avati@gluster.com> BUG: 2859 (gsyncd crashes if master vol root has no xattrs) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=2859
* syncdaemon: some refactor on monitorCsaba Henk2011-05-093-13/+17
| | | | | | | | | | | - detect faulty state early - keep the feedback fd in gsyncd module Signed-off-by: Csaba Henk <csaba@gluster.com> Signed-off-by: Anand Avati <avati@gluster.com> BUG: 2537 (gsync autorestart) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=2537
* syncdaemon: add --normalize-url optionCsaba Henk2011-05-091-5/+8
| | | | | | | | Signed-off-by: Csaba Henk <csaba@gluster.com> Signed-off-by: Anand Avati <avati@gluster.com> BUG: 2828 (gluster geo-rep stop should not show unsuccessful when the status is corrupt) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=2828
* syncdaemon: have the monitor kill the worker if it does not connect in 60 secCsaba Henk2011-04-223-4/+33
| | | | | | | | Signed-off-by: Csaba Henk <csaba@gluster.com> Signed-off-by: Anand Avati <avati@gluster.com> BUG: 2736 (gsyncd hangs if crash occurs in the non-main thread) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=2736
* syncdaemon: handle errors in glusterfs mount more carefullyv3.2.0qa15Csaba Henk2011-04-211-4/+11
| | | | | | | | Signed-off-by: Csaba Henk <csaba@gluster.com> Signed-off-by: Anand Avati <avati@gluster.com> BUG: 2826 (stale auxiliary mounts are left over) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=2826
* syncdaemon: fix double wait in monitorCsaba Henk2011-04-211-1/+1
| | | | | | | | Signed-off-by: Csaba Henk <csaba@gluster.com> Signed-off-by: Anand Avati <avati@gluster.com> BUG: 2816 ([glusterfs-3.2.0qa14]: gsyncd monitor crashed) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=2816
* syncdaemon: add session-owner optionCsaba Henk2011-04-192-1/+8
| | | | | | | | Signed-off-by: Csaba Henk <csaba@lowlife.hu> Signed-off-by: Anand Avati <avati@gluster.com> BUG: 2785 (gsyncd logs on slave side go to /dev/null) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=2785
* syncdaemon: implement template substitutions for config valuesCsaba Henk2011-04-193-22/+66
| | | | | | | | | | | | | | | | | | | | | | | | | So, for example, a log file setting of /var/log/${mastervol}/${eSlave}.log will be substituted with the volume name of the master and the canonicalized-escaped name of the slave for each master-slave pair. As template expanders, beyond the various forms and derivatives of master and slave, the following are also available: - gsyncd tunables (set in command line or in config) - for regexp sections, regexp group captures can be accessed via "match<i>_<n>", where i=1,2 corresponds to the i-th peer-rx in the section title and n=1,... to the n-th capture. This will enable us to have a static configuration (not having to add new entries on each gsyncd start). Signed-off-by: Csaba Henk <csaba@lowlife.hu> Signed-off-by: Anand Avati <avati@gluster.com> BUG: 2785 (gsyncd logs on slave side go to /dev/null) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=2785
* gsyncd service auto-discoveryCsaba Henk2011-04-191-1/+49
| | | | | | | | | | | If glusterd is running, gsyncd will find it out and adopt related settings automagically (even if started from not by glusterd) Signed-off-by: Csaba Henk <csaba@lowlife.hu> Signed-off-by: Anand Avati <avati@gluster.com> BUG: 2785 (gsyncd logs on slave side go to /dev/null) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=2785
* syncdaemon: fix swallowing of exit valueCsaba Henk2011-04-191-1/+1
| | | | | | | | Signed-off-by: Csaba Henk <csaba@lowlife.hu> Signed-off-by: Anand Avati <avati@gluster.com> BUG: 2736 (gsyncd hangs if crash occurs in the non-main thread) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=2736
* syncdaemon: pythonize accidentally copied ruby line in codeCsaba Henk2011-04-191-1/+1
| | | | | | | | Signed-off-by: Csaba Henk <csaba@lowlife.hu> Signed-off-by: Anand Avati <avati@gluster.com> BUG: 2791 (trying to set up geo-replication with a gluster slave on the LAN screws up geo-rep irrecoverably) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=2791
* syncdaemon: don't accept simple identifiers anymore as sugared urlsCsaba Henk2011-04-191-1/+3
| | | | | | | | | | | - we want to enforce the separation of the volume name and the url namespaces - resolving simple ids as relative paths was lame anyway Signed-off-by: Csaba Henk <csaba@lowlife.hu> Signed-off-by: Anand Avati <avati@gluster.com> BUG: 2786 (Having to prepend geo-replication master vol with colon spoils the UI) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=2786
* syncdaemon: minor cleanups on terminationCsaba Henk2011-04-172-8/+9
| | | | | | | | Signed-off-by: Csaba Henk <csaba@gluster.com> Signed-off-by: Anand Avati <avati@gluster.com> BUG: 2736 (gsyncd hangs if crash occurs in the non-main thread) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=2736
* syncdaemon: load xattrs from libc on-demandCsaba Henk2011-04-163-56/+75
| | | | | | | | | | | This reduces startup time for invocations other than master / slave role (kind of which now proliferates glusterd) Signed-off-by: Csaba Henk <csaba@gluster.com> Signed-off-by: Anand Avati <avati@gluster.com> BUG: 2780 (geo-replication operations take too much time to complete) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=2780
* syncdaemon: yet another try to exit properlyCsaba Henk2011-04-163-83/+92
| | | | | | | | | | | | The final cleanup sequence + call to _exit, which was just done in the main thread, now is called for in each thread when the thread crashes. Seems we aren't left there hanging this way. Signed-off-by: Csaba Henk <csaba@gluster.com> Signed-off-by: Anand Avati <avati@gluster.com> BUG: 2736 (gsyncd hangs if crash occurs in the non-main thread) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=2736
* syncdaemon: when getting a single config option, don't display the option ↵Csaba Henk2011-04-161-5/+8
| | | | | | | | | | | | name, just the value This intends to ease scripting (you can just pass on the value to xargs etc.) Signed-off-by: Csaba Henk <csaba@gluster.com> Signed-off-by: Anand Avati <avati@gluster.com> BUG: 1570 (geosync related changes) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=1570
* syncdaemon: name tempdirs used by gsyncd more characteristically to ease ↵Csaba Henk2011-04-151-2/+2
| | | | | | | | | | debugging Signed-off-by: Csaba Henk <csaba@gluster.com> Signed-off-by: Anand Avati <avati@gluster.com> BUG: 1570 (geosync related changes) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=1570
* syncdaemon: split gluster_command to make it possible to set options for ↵Csaba Henk2011-04-151-1/+1
| | | | | | | | | | glusterfs Signed-off-by: Csaba Henk <csaba@gluster.com> Signed-off-by: Anand Avati <avati@gluster.com> BUG: 1570 (geosync related changes) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=1570
* syncdaemon: work around python feature of allowing double leading slashes in ↵Csaba Henk2011-04-151-1/+4
| | | | | | | | | | canonicalized paths Signed-off-by: Csaba Henk <csaba@gluster.com> Signed-off-by: Anand Avati <avati@gluster.com> BUG: 1570 (geosync related changes) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=1570
* syncdaemon: ensure -/_ invariance in tunables, in all componentsCsaba Henk2011-04-133-18/+32
| | | | | | | | Signed-off-by: Csaba Henk <csaba@gluster.com> Signed-off-by: Anand Avati <avati@gluster.com> BUG: 2659 (gsync config-del option is not working properly) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=2659
* syncdaemon: refactor gsyncd.py cmdline interface to configurationCsaba Henk2011-04-131-19/+35
| | | | | | | | | | | - existence of given tunable is checked - add --config-check option to just do a check for existence of tunable Signed-off-by: Csaba Henk <csaba@gluster.com> Signed-off-by: Anand Avati <avati@gluster.com> BUG: 2659 (gsync config-del option is not working properly) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=2659
* syncdaemon: force termination for unhandled exception in any threadCsaba Henk2011-04-135-13/+27
| | | | | | | | Signed-off-by: Csaba Henk <csaba@gluster.com> Signed-off-by: Anand Avati <avati@gluster.com> BUG: 2736 (gsyncd hangs if crash occurs in the non-main thread) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=2736
* syncdaemon: streamline user-visible messages (and control flow a bit, too)Csaba Henk2011-04-132-11/+11
| | | | | | | | Signed-off-by: Csaba Henk <csaba@gluster.com> Signed-off-by: Anand Avati <avati@gluster.com> BUG: 2644 (no volume-mark, if the behaviour persists have to check if master gsyncd is running.) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=2644
* syncdaemon: fix parsing of the volume-mark structureCsaba Henk2011-04-131-1/+1
| | | | | | | | | | | The parsing error implied that all xtimes were considered to be valid, regardless of the volume mark. Signed-off-by: Csaba Henk <csaba@gluster.com> Signed-off-by: Anand Avati <avati@gluster.com> BUG: 2535 (gsync cascading) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=2535
* syncdaemon: return exit code properlyCsaba Henk2011-04-131-3/+6
| | | | | | | | Signed-off-by: Csaba Henk <csaba@gluster.com> Signed-off-by: Anand Avati <avati@gluster.com> BUG: 1570 (geosync related changes) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=1570
* syncdaemon: fix pidfile deletion on failed pidfile acquisitionCsaba Henk2011-04-131-1/+6
| | | | | | | | | | | (not triggered in glusterd instrumentation of gsyncd as glusterd does pidfile probing by itself) Signed-off-by: Csaba Henk <csaba@gluster.com> Signed-off-by: Anand Avati <avati@gluster.com> BUG: 1570 (geosync related changes) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=1570
* syncdaemon: minor fixesCsaba Henk2011-04-133-4/+2
| | | | | | | | | | | - whitespace fix - remove superfluous imports Signed-off-by: Csaba Henk <csaba@gluster.com> Signed-off-by: Anand Avati <avati@gluster.com> BUG: 1570 (geosync related changes) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=1570
* temporary workaround for mtab update race thingyCsaba Henk2011-04-121-0/+1
| | | | | | | | Signed-off-by: Csaba Henk <csaba@gluster.com> Signed-off-by: Anand Avati <avati@gluster.com> BUG: 2690 (race between mtab updates of mount and umount) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=2690
* syncdaemon: do not use os.getlogin() for getting the name of the current userCsaba Henk2011-04-111-1/+2
| | | | | | | | | | This function relies on the terminal (cf. getlogin(3)), which is not available if we run as daemon Signed-off-by: Csaba Henk <csaba@gluster.com> Signed-off-by: Anand Avati <avati@gluster.com> BUG: 2712 (username resolution in gsyncd fails) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=2712
* syncdaemon: fix transaction codeCsaba Henk2011-04-112-7/+7
| | | | | | | | Signed-off-by: Csaba Henk <csaba@gluster.com> Signed-off-by: Anand Avati <avati@gluster.com> BUG: 2659 (gsync config-del option is not working properly) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=2659
* syncdaemon: minor fixesCsaba Henk2011-04-112-3/+3
| | | | | | | | | | | | - fix yet another instance of calling exit (instead of {sys.,os._}exit) - fix logging to stderr with "-" as logfile - whitespace fix Signed-off-by: Csaba Henk <csaba@gluster.com> Signed-off-by: Anand Avati <avati@gluster.com> BUG: 1570 (geosync related changes) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=1570
* syncdaemon: fix setting None as new masterCsaba Henk2011-04-111-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | We checked for the event of a new master being adopted by: - checking for state change in list of masters - checking if our chosen master is a foreign one and if these held, then wrote out the actually available master to config However this was flaky: if (1) native master changed (2) there was already a foreign master adopted (3) actually the master was not available then we wrote out the None to config. This could occur if: - on syncd startup, native master just changes from None to the volume native [implies (1)] - foreign master adopted from earlier run via config [implies (2)] - actually foreign master was not available [implies (3)] Signed-off-by: Csaba Henk <csaba@gluster.com> Signed-off-by: Anand Avati <avati@gluster.com> BUG: 2670 (strange behaviour with intermediate-master and slave) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=2670
* syncdaemon: add monitor mode to support autorestartCsaba Henk2011-04-045-16/+105
| | | | | | | | Signed-off-by: Csaba Henk <csaba@gluster.com> Signed-off-by: Vijay Bellur <vijay@dev.gluster.com> BUG: 2537 (gsync autorestart) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=2537
* syncdaemon: provide transactional semantics to config file writingCsaba Henk2011-04-042-13/+49
| | | | | | | | | | | | So updating the config file from multiple contexts won't mess it up. This prepares the next commit where we'll set options internaly (which lacks the serial nature of user actions). Signed-off-by: Csaba Henk <csaba@gluster.com> Signed-off-by: Vijay Bellur <vijay@dev.gluster.com> BUG: 2537 (gsync autorestart) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=2537
* syncdaemon: give some refactoring to cascading codeCsaba Henk2011-04-042-84/+116
| | | | | | | | | | | | | | | | | | | | | | | - expiry check of foreign volinfo moved back to GLUSTERServer, so that under the hood we can removexattr the expired ones; a nice side-effect is that we can use the same dict layout for foreign and native volinfo (ie., foreign needs no timeout field) - get_volinfo() is renamed to get_sys_volinfo() and most of the logic is stripped off of it (what remained there is the check against foreign master ambiguity) - volinfo transition logic is cut out to an almost purely functional static method (only impurity is the exeption raised upon forbidden volinfo change) - ping renamed to keep-alive, as something called "ping" is not supposed to have payload (yeah, keep-alive is a bit fishy on this front too, but could not come up with better...) Signed-off-by: Csaba Henk <csaba@gluster.com> Signed-off-by: Vijay Bellur <vijay@dev.gluster.com> BUG: 2535 (gsync cascading) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=2535
* syncdaemon: fix up fallback xtime value for slaveCsaba Henk2011-04-011-1/+1
| | | | | | | | Signed-off-by: Csaba Henk <csaba@gluster.com> Signed-off-by: Vijay Bellur <vijay@dev.gluster.com> BUG: 2535 (gsync cascading) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=2535
* syncdaemon: minor cleanups in cascading codeCsaba Henk2011-03-311-7/+1
| | | | | | | | Signed-off-by: Csaba Henk <csaba@gluster.com> Signed-off-by: Vijay Bellur <vijay@dev.gluster.com> BUG: 2535 (gsync cascading) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=2535
* syncdaemon: fix "--debug" option of gsyncd.pyCsaba Henk2011-03-311-3/+8
| | | | | | | | | | | also be explicit about logging to a stream (ie. don't rely on the feature of accessing stdin through /dev/stdin) Signed-off-by: Csaba Henk <csaba@gluster.com> Signed-off-by: Vijay Bellur <vijay@dev.gluster.com> BUG: 2637 (gsyncd --debug broken) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=2637
* Gsyncd: Cascading of gsync daemonsKaushik BV2011-03-292-34/+155
| | | | | | | | | | This patch allows the slave of a gsyncd to be started as the master of another slave gsyncd. Signed-off-by: Kaushik BV <kaushikbv@gluster.com> Signed-off-by: Vijay Bellur <vijay@dev.gluster.com> BUG: 2535 (gsync cascading) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=2535
* Gsyncd: fix a typo for the command-line arg of gluster processKaushik BV2011-03-251-1/+1
| | | | | | | | Signed-off-by: Kaushik BV <kaushikbv@gluster.com> Signed-off-by: Vijay Bellur <vijay@dev.gluster.com> BUG: 1570 (geosync related changes) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=1570
* Revert "syncdaemon: make /usr/libexec/gsyncd the default remote gsyncd ↵Csaba Henk2011-03-171-1/+1
| | | | | | | | | | | | | | | | | (incomplete hacky quickfix)" This reverts commit 8c801cfd05eb533ae64ea9f06e49e632955cf0c0. The commit in question was just a temporary fix (which violated component boundaries). Since 9043b0f8 we don't rely on this fix. Signed-off-by: Csaba Henk <csaba@gluster.com> Signed-off-by: Vijay Bellur <vijay@dev.gluster.com> BUG: 2427 (set a proper default for remote syncdaemon) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=2427
* syncdaemon: fix up exit valueCsaba Henk2011-03-171-2/+4
| | | | | | | | Signed-off-by: Csaba Henk <csaba@gluster.com> Signed-off-by: Vijay Bellur <vijay@dev.gluster.com> BUG: 2380 (TypeError: 'str' object is not callable) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=2380
* syncdaemon: don't try to set log level to NoneCsaba Henk2011-03-171-1/+3
| | | | | | | | Signed-off-by: Csaba Henk <csaba@gluster.com> Signed-off-by: Vijay Bellur <vijay@dev.gluster.com> BUG: 1570 (geosync related changes) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=1570
* Gsyncd: Explicitly mention the path for the gsyncd.py scriptKaushik BV2011-03-141-1/+1
| | | | | | | | Signed-off-by: Kaushik BV <kaushikbv@gluster.com> Signed-off-by: Vijay Bellur <vijay@dev.gluster.com> BUG: 2437 () URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=2437