August 2014 - sanlock-devel - Fedora Mailing-Lists

by David Teigland

reset/sanlk_reset.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) New commits: commit 401c5816aa16f28798510b0b77ab9b2abd1b23b7 Author: Nir Soffer <nsoffer(a)redhat.com> Date: Mon Aug 18 23:52:48 2014 +0300 reset: Require lockspace name for local deamon operations sanlk-reset required lockspace name for the reset command, but did not require it for reg, end, and clear commands. Running a comment without did nothing and exit with zero exit code. Now a lockspace name is required for all commands and the tool exit with exit code 2 if not available. Signed-off-by: Nir Soffer <nsoffer(a)redhat.com> diff --git a/reset/sanlk_reset.c b/reset/sanlk_reset.c index 6bff43e..56cada3 100644 --- a/reset/sanlk_reset.c +++ b/reset/sanlk_reset.c @@ -566,6 +566,11 @@ int main(int argc, char *argv[]) } } + if (!ls_count) { + fprintf(stderr, "lockspace_name is required\n"); + exit(2); + } + /* * Update local sanlk-resetd. */ @@ -583,11 +588,6 @@ int main(int argc, char *argv[]) exit(2); } - if (!ls_count) { - fprintf(stderr, "lockspace_name is required\n"); - exit(2); - } - if ((ls_count > 1) && (target_host_id || target_generation)) { fprintf(stderr, "-i and -g options are only allowed with a single lockspace_name\n"); exit(2);

9 years, 8 months

1
0
0 / 0

reset/Makefile

by David Teigland

reset/Makefile | 2 ++ 1 file changed, 2 insertions(+) New commits: commit e3b162bf6c3a033eedb043cf086f84084d495e91 Author: David Teigland <teigland(a)redhat.com> Date: Mon Aug 18 16:04:50 2014 -0500 reset: install man pages Signed-off-by: David Teigland <teigland(a)redhat.com> diff --git a/reset/Makefile b/reset/Makefile index 457da5e..d67ceb3 100644 --- a/reset/Makefile +++ b/reset/Makefile @@ -58,3 +58,5 @@ MANDIR=/usr/share/man install: all $(INSTALL) -d $(DESTDIR)/$(BINDIR) $(INSTALL) -c -m 755 $(TARGET1) $(TARGET2) $(DESTDIR)/$(BINDIR) + $(INSTALL) -m 644 sanlk-reset.8 $(DESTDIR)/$(MANDIR)/man8/ + $(INSTALL) -m 644 sanlk-resetd.8 $(DESTDIR)/$(MANDIR)/man8/

9 years, 8 months

1
0
0 / 0

[PATCH] reset: Require lockspace name for local deamon operations

by Nir Soffer

sanlk-reset required lockspace name for the reset command, but did not require it for reg, end, and clear commands. Running a comment without did nothing and exit with zero exit code. Now a lockspace name is required for all commands and the tool exit with exit code 2 if not available. Signed-off-by: Nir Soffer <nsoffer(a)redhat.com> --- reset/sanlk_reset.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/reset/sanlk_reset.c b/reset/sanlk_reset.c index 6bff43e..56cada3 100644 --- a/reset/sanlk_reset.c +++ b/reset/sanlk_reset.c @@ -566,6 +566,11 @@ int main(int argc, char *argv[]) } } + if (!ls_count) { + fprintf(stderr, "lockspace_name is required\n"); + exit(2); + } + /* * Update local sanlk-resetd. */ @@ -583,11 +588,6 @@ int main(int argc, char *argv[]) exit(2); } - if (!ls_count) { - fprintf(stderr, "lockspace_name is required\n"); - exit(2); - } - if ((ls_count > 1) && (target_host_id || target_generation)) { fprintf(stderr, "-i and -g options are only allowed with a single lockspace_name\n"); exit(2); -- 1.8.3.1

9 years, 8 months

1
0
0 / 0

Changes to 'refs/tags/sanlock-3.2.0'

by David Teigland

Changes since the dawn of time: Antoni S. Puimedon (1): systemd: prevent sigkill from being sent Daniel P. Berrange (15): Fix const-ness of many APIs. Fix warnings in watchdog module Fix function prototypes for no-arg methods Remove use of 'index' as a variable name Make many functions static Fix missing include in logging file Annotate many unused parameters to avoid warnings Remove redundant redeclaration of 'to' variable Fix args to execv() Remove redundant arg to 'run_command' Rename optarg to optionarg to avoid clashing with getopt.h Disable the read_request method since it is unused Add many more compiler warning flags & safety checks Hard code a sector size of 512 if the lease volume is a regular file Ensure libsanlock.so is built with debug/warning flags David Teigland (459): sync_manager: initial commit sync_manager: misc updates sync_manager: misc updates sync_manager: misc updates sync_manager: misc updates sync_manager: add more logging sync_manager: misc updates sync_manager: misc updates sync_manager: num_hosts/MAX_HOSTS stuff daemon: reworking notions of resource_id/token_name sync_manager: resource lockfiles sync_manager: lease arg processing sync_manager: Began multiple lease support sync_manager: use first command line arg as action sync_manager: leader record changes and verify sync_manager: clean up released leases sync_manager: move functions around sync_manager: add more tool actions sync_manager: naming changes sync_manager: separate token index and id sync_manager: fix index usage and other misc sync_manager: use pthread cond in acquire sync_manager: write all log entries sync_manager: simplify polling sync_manager: fix waitpid use sync_manager: acquire can fail early sync_manager: write log entries at exit sync_manager: add test program sync_manager: move secondary pid check sync_manager: fix disk paxos contention devcount: fix verify checks sync_manager: add GPL license file sync_manager: fix leader block offsets sync_manager: increase COMMAND_MAX sync_manager: renewal should verify sync_manager: use sector size from libblkid sync_manager: use a real checksum function sync_manager: add libblkid to spec file sync_manager: print status info sync_manager: one watchdog file per lease sync_manager: lease_threads handle watchdog files sync_manager: fix/add some text/comments sync_manager: refactor read/write sync_manager: move disk io functions sync_manager: remove token arg sync_manager: rename paxos_disk sync_disk sync_manager: add aio read/write sync_manager: make io_timeout_seconds a diskio arg sync_manager: forgot to add new files sync_manager: use log thread sync_manager: client connections sync_manager: connection processing sync_manager: send/recv pid sync_manager: add write_sectors sync_manager: restructuring sync_manager: write_sectors code factoring sync_manager: daemonize sync_manager: releasing leases sync_manager: async releasing sync_manager: release fixes sync_manager: add direct and indirect acquire/release sync_manager: reacquire resources sync_manager: move code sync_manager: same pid may reacquire resource sync_manager: lease migration sync_manager: handle client errors sync_manager: improve error handling sync_manager: host_id leases sync_manager: remove empty files sync_manager: print initialization info sync_manager: rename files sync_manager: clean up header org sync_manager: delta_lease implementation sync_manager: accept offset units sync_manager: fix up init output sync_manager: put back watchdog calls sync_manager: fix start_host_id error paths sync_manager: add log_error's for watchdog file errors sync_manager: actual timeouts sync_manager: change timeouts on cmd line sanlock: create new external api sanlock: build libsanlock sanlock: use MAX_LEASES everywhere sanlock: add libvirt plugin sanlock plugin: couple minor fixes sanlock: clean up /var file names sanlock plugin: fix symbol needed by libvirt sanlock: add some debug output sanlock plugin: fix uuid copy sanlock plugin: fix names sanlock: add "owner_name" sanlock: fix renewal checks sanlock: clean up host_id types sanlock: set_host_id command sanlock: fix killing pids sanlock: add status command sanlock: set version to 1.0 sanlock: delta_lease cleanup sanlock: changing num_hosts sanlock: add dump command sanlock: renewal timings sanlock: add direct option sanlock: check for watchdog file sanlock: recovery fixes lock_driver_sanlock: fix compile problems sanlock: improve command options sanlock: tidying help text sanlock: move binary to /usr/sbin sanlock: add init script sanlock: fix sigterm shutdown sanlock: init stop sanlock: add wdtest command sanlock.spec: new url lock_driver_sanlock: remove close sanlock: introduce lockspaces lock_driver_sanlock: remove files sanlock: better logging functions sanlock: misc log message sanlock.spec: sbin not libexec sanlock init: remove watchdog reference wdmd: watchdog multiplexing daemon sanlock: add code to use wdmd sanlock/wdmd: use wdmd in sanlock sanlock/wdmd: add copyright header to source files sanlock: rename sanlock source dir sanlock: move tests dir move COPYING file wdmd: use signalfd for signal handling Fix Makefile comments wdmd: fix daemon debug option wdmd: add init script sanlock.spec: updates sanlock.spec: src dir sanlock: build with uninstalled libwdmd sanlock: version 1.1 sanlock: high priority options wdmd: high priority options sanlock: return migration state sanlock: migration.txt describes libvirt/sanlock steps libsanlock: include admin functions sanlock: fix host_id expiration check sanlock: migration working devcount: migrate test sanlock: setowner improvements sanlock: migrate to target fix sanlock: fix wdmd stop order sanlock: various fixes sanlock: remove wdtest sanlock: remove migration sanlock: clean up command return data sanlock: add resource string conversion functions sanlock: rework internal structs devcount: add relock test sanlock: fix release and inquire sanlock: add_lockspace EEXIST sanlock: rework client handling sanlock: clean up warnings sanlock: debug message changes sanlock: add lockspace checks wdmd: enable test scripts sanlock: add str_to_lockspace to lib WIP devcount migrate devcount: new migrate test sanlock: read_id and live_id commands sanlock: check lockspace name and host_id sanlock: remove remaining cluster_mode sanlock: add libsanlock_direct devcountn: start multiple devcount tests devcount: small changes sanlock: new return values sanlock: misc changes and fix sanlock: log error of full bad block sanlock: interval between renewal checks sanlock: renewal changes sanlock: fix log_dump sanlock: fix find_client_pid sanlock: fix host_id reads from paxos_acquire sanlock: init with one write devcount: improve output devcount: new pause/resume devcount: add expire test sanlock: correct paxos usage sanlock: direct read_leader sanlock: paxos delays sanlock: use thread pool sanlock: client status output format changes sanlock: fix inquire of dead pid sanlock: use native linux aio sanlock: i/o changes sanlock: aio changes sanlock: reduce paxos acquire read ops sanlock: quiet error case sanlock: don't free aio buf until event completes sanlock: io timeout related changes sanlock: read dblocks in single aligned io sanlock: add sanlock_restrict api sanlock: add sanlock_direct_sector_size api sanlock: add checksum to dblocks sanlock: fix init restart sanlock: don't release tokens in dead lockspace sanlock: fix adding lockspace sanlock: official 1MB/8MB alignment devcount: use aio in init libsanlock: link with LDFLAGS sanlock: increase version to 1.3 sanlock/wdmd: shut up warnings sanlock: fix libwdmd linking remove spec file sanlock: use a completed read after renewal timeout sanlock: use unique host name in delta leases sanlock: remove sector_size api sanlock: abort delta wait on shutdown sanlock: fix add_lockspace failure sanlk_load: add new test sanlock: fix recv and inquire sanlock: initial pid_dead check in acquire sanlock: release 1.4 sanlock: generate a uuid for host id sanlock: return -EINPROGRESS from add_lockspace sanlk_load: periodically kill and replace a pid sanlock: zero num_hosts uses DEFAULT_MAX_HOSTS tests: misc changes sanlock: break paxos_acquire wait loop sanlock: increase log line to 512 bytes sanlock: change a log_error to log_debug sanlock: fail host_id when corrupted sanlock: release 1.5 sanlock: release 1.6 sanlock: handle colon escaping in path strings wdmd: add option for high priority wdmd: use accept4 with SOCK_NONBLOCK wdmd: tidy sun_addr snprintf wdmd: pid and sock file changes wdmd: add man page wdmd: disable test scripts sanlock: use accept4 with SOCK_NONBLOCK sanlock: tidy sun_addr snprintf sanlock: add explicit -luuid sanlock: pid and sock file changes sanlock: add man page sanlock/wdmd: improve mkdir of run dir wdmd: new build flags sanlock: new build flags sanlock/wdmd: use monotonic time sanlock: build with pie sanlock/wdmd: nonblocking listening/accept sanlock: add missing monotime files sanlock: update man page sanlock: man page update sanlock: update man page and help text sanlock: print connections limit release: sanlock 1.7 makefile: install mode for man pages sanlock: read align_size in renewal sanlock: check other host_id leases sanlock: minor fixes and cleanups sanlock: add request api/cmd sanlock: crc code tidying sanlock/wdmd: add license header to files sanlock: create libsanlock_client sanlock: move client code remove COPYING file sanlock: remove internal header from sanlock_sock libsanlock_client: use LGPLv2+ libwdmd: use LGPLv2+ sanlock_rv.h: switch to LGPLv2+ README.license: document licenses sanlock: client align and init sanlock: write request record sanlock: request struct magic and version numbers sanlock: set bitmap for requests sanlock: examine resource requests sanlock: update man page sanlock: remove old comment sanlock: renaming functions sanlock: optimize paxos wait sanlock: use flags in struct resource sanlock: restructure lockspace checks sanlock: remove BLOCK_WD force mode libsanlock: fix function stubs sanlock: new status and host_status sanlock: improve status output sanlock: status output sorting sanlock: SIGTERM and SIGKILL for REQ_KILL_PID sanlock: add flag RESTRICT_SIGKILL sanlock: setup fewer aio events sanlock: move cmd processing sanlock: suppress log messages sanlock: rename source files sanlock: improve killing pids sanlock: fix log_dump version 1.8 sanlock: quick host_id reacquire sanlock: add force option to shutdown command simpler copyright line default to GPLv2+ for our original files sanlock: improve daemon permission errors add systemd files fixing up init stuff release 1.9 sanlock: setmode Revert "sanlock: setmode" sanlock: fix error exit sanlock: fix debug line init scripts: fix path to restorecon sanlock: shared mode for leases sanlock: fix missing close_disks sanlock: fix problem in paxos sanlock: add paxos sanity check sanlock: fix leaking fd sanlock: change to paxos algorithm sanlock: change ondisk version sanlock: remove log noise sanlock: ignore SIGTERM if lockspaces exist sanlock: quiet more error messages sanlk_load: munging variable names sanlk_load: add shared locks sanlock: kill client connection on recv error sanlk_load: ignore release errors sanlock: set sector_size in shared tokens sanlock man page: mention SH release 2.0 sanlock: clean up warnings sanlock: fix inquire state string sanlock: retry transient sh failures sanlock: status for all shared tokens sanlock: add a logrotate file release 2.1 python: fix path strncpy sanlock: remove physical sector size requirement sanlock: add sample sysconfig file sanlock: ASYNC flag for lockspace add and rem sanlock: UNUSED flag for lockspace rem release 2.2 sanlock.log: empty file to install from rpm Revert "sanlock.log: empty file to install from rpm" sanlock: remove limits.conf sysconfig: remove user option init: root user release 2.3 latest spec file sanlock.spec: fix exclusive arch sanlock/wdmd: use /var/log/subsys/file daemon: skip setup_groups when no -U or -G sanlock.spec: require useradd and groupadd sanlock.spec updated daemon: don't put struct space on stack daemon: fix add_lockspace that has been removed daemon: fix inquire lver daemon: graceful pid handling Revert "init: make explicit to run sanlock as root" remove spec file release 2.4 daemon: include resource.h daemon: fix lockfile ownership wdmd: use lockfile mode 644 sanlock: use lockfile mode 644 wdmd: use shm_open to prevent restart sanlock: remove umask 0 sanlock/wdmd: remove global connection daemon: extend grace time wdmd: close device when test fails wdmd: preemptive close before test fails wdmd: pet after reopen and use 1 sec interval after failure sanlock: base kill sig on last renewal clientn: add tests tests: add test-recovery script sanlock: fix paxos acquire host_id check daemon: use helper for examine request kill sanlock: show host_status for all lockspaces sanlock: fix status of lockspaces in add and rem sanlock: adjustable io timeouts sanlock: add direct next_free command sanlock: request force_mode 2 is SIGUSR1 sanlock: print escape chars in path from status release 2.5 sanlock: configurable mlockall level sanlock: change log level for startup and io timeouts sanlock: update man page sanlock: fix aborted command clearing sanlock: client add_lockspace with timeout sanlock: print command output to stdout wdmd: new script handling fence_sanlock: new code fence_sanlock: various fixes and changes fence_sanlock: variable alignment fence_sanlockd: use init script fence_sanlock: add man pages fence_sanlock: use SIGHUP for shutdown fence_sanlock: handle two node fence duel sanlock/wdmd: get version from common file wdmd: show option values in start message release 2.6 fix systemd service files wdmd: use mode 775 for run dir sanlock: clean up daemon exit error path sanlock: read and write apis for lockspace and resource sanlock: new get_lockspaces api sanlock: get_lockspaces count only sanlock: make get_lockspaces allocate space for data wdmd: dynamically select working watchdog device fence_sanlock: fix man page name of path arg sanlock: shutdown or rem_lockspace should SIGKILL sanlock: fix usage output typos release 2.7 sanlock: add request killpath sanlock/fence_sanlock: request modes FORCE and GRACEFUL sanlock: update request types in man page sanlock: add get_hosts api sanlock: remove direct read_id and live_id sanlock: add read_resource_owners sanlock: add test_resource_owners sanlock: add flag SANLK_REQUEST_NEXT_LVER sanlock: improve check of max_hosts and num_hosts sanlock: add a comment test: add another test program sanlock: check for null arg in sanlock_request release 2.8 sanlock: add lvb feature sanlock: add SANLK_REL_RENAME release 3.0.0 sanlock: free hss on error sanlock: reinit hss in loop sanlock: fix read_lockspace name comparison sanlock: initialize owner_id sanlock: initialize send_len and send_buf release 3.0.1 sanlock: fix debug status for add/rem lockspace sanlock: add_lockspace error for conflicting lockspace definitions sanlock: add some acquire error descriptions sanlock: use ADD and REM suffix in status output sanlock: transient timeout handling in acquire and release sanlock: add convert sanlock: allow more than 8 resources per client tests: sanlk_load sanlock: fix spaces in path names wdmd: add probe option release 3.1.0 sanlock: version interface sanlock: shutdown reply sanlock: fix get_hosts off by one sanlock: lockspace host events sanlock: set_config api reset: daemon and program for resetting hosts sanlock: disk endian handling sanlock: persistent and orphan resource leases fence_sanlock: use persistent and orphan features reset: remove DEBUG init: add service file for sanlk-resetd init: misc changes sanlock: log error for invalid set_event args sanlock: close event fds when lockspace is removed sanlock: fix missing mutex unlock in previous commit sanlock: host event struct missing host_id in get_event reset: add ability to clear all sanlk-reset: no args should print help tests: update sanlk_events reset: add man pages release 3.2.0 David Weber (3): Fix order of linking Install another symlink to shared library Replace restrict field name with restricted Fabio M. Di Nitto (15): build: sanlock should link with libsanlock build: install shared lib header files and fix DESTDIR usage build: drop rpm target spec file: do first cut for total spec file build: fix linking with libsanlock and install target fence_sanlock: add install bits fence_sanlockd: add missing \n fence_sanlock: cleanup shell usage fence_sanlock: don't restart fence_sanlockd if it's already running fence_sanlock: add basic metadata to integrate with ccs_config_validate fence_sanlock: improve action_on error checking and report fence_sanlock: unify code and silence some operations fence_sanlockd init: cleanup, remove hardcoded paths and use system service fence_sanlock: fix build to be selfcontained systemd: add fence_sanlockd service file Federico Simoncelli (76): rpm: sync specfile with fedora rpm: add sanlock_admin.h header rpm: add the lib package, install the initscripts python: remove unused python code python: add python binding python: release the gil during sanlock operations python: wrap sanlock extension with a module rpm: add python binding package python: pass a lockspace copy to str_to_lockspace makefile: fix install typo rpm: add sanlock_direct header python: add sanlock init functions and exception direct: close disks after initialization python: register process only once daemon: configurable socket permissions rpm: add sanlock user and group python: exceptions must contain the errno rpm: add missing libaio-devel dependency rpm: add daemon options in the init file python: add missing aio library python: add get_alignment function libs: include libsanlock_direct into libsanlock python: align num_hosts and max_hosts defaults python: expose sanlock file descriptor python: improve error reporting python: parse lockspaces and resources natively python: add usage example python: initial support for sanlock errors python: document the sanlock module python: module cleanup build: fix documentation install path client: return appropriate errno on failure python: expose errno in the exception python: acquire leases for other processes sanlock: implement the inq_lockspace command python: add the inq_lockspace command binding misc: run sanlock daemon as sanlock user wdmd: use getopt to parse the command line wdmd: make socket group ownership configurable python: add shared resource parameter to acquire python: release leases for other processes python: ASYNC flag for lockspace add and rem python: UNUSED flag for lockspace rem log: add full time and date to the log messages sanlock: set the supplementary groups at startup log: add the thread id in the log messages sanlock: fix an rv check typo in setup_groups init: add a stop timeout for the sanlock service build: add a generic rpm spec file init: make explicit to run sanlock as root wdmd: load the softdog module when needed sanlock: WAIT flag for sanlock_inq_lockspace daemon: drop root privileges and use the helper init: use checkpid when stopping the services sanlock: expose sanlock path import and export utils sanlock: configuring the core dump output python: fix the tuple parsing for py_add_lockspace sanlock: use signal handler for all terminating signals systemd: add wdmd dependency for sanlock wdmd: trap also SIGINT for a clean exit wdmd: make the watchdog device configurable python: fix typo for the offset parameter python: add write lockspace and resource python: add read lockspace and resource wdmd: fix miscellaneous build warnings misc: add wdmd to gitignore python: fix multiple issues reported by cpychecker python: add get_lockspaces python: use the write commands in example.py python: add the versioning support to acquire python: return lease version in read_resource python: rename SANLK_LSF flags and constants macro python: improve example with signals and exceptions python: add the support for the resource request python: add the get_hosts support python: add support to read resource owners Nir Soffer (3): sanlk-resetd: Allow only privileged user to modify configuration reset: Use find_ls to remove lockspace by name python: add support for lockspace events Saggi Mizrahi (25): Added the begining of the testing and debugging tools Better handling of max hosts sync_manager: Updated tests to work with new lease struct sync_manager: fixed skipping first arg in command sync_manager: acquire and release actions sync_manager: minor fixes sync_manager: renamed stuff sync_manager: made acquire synchronous again sync_manager: added set_host_id action sync_manager: use kill(0) for secondary pid check sync_manager: make rpm and install sync_manager: spec file update sync_manager: Allow longer resource names sync_manager: allow repeated set_host_id sync_manager: Added escaping for the leases arg sync_manager: Created the python bindings for sync_manager sync_manager: listener socket permissions sync_manager: Updated python binding and tests sync_manager: Made 'token' a const in log_level sync_manager: refactor messaging system sync_manager: use getsockopt PEERCRED Fix various build warnings Tidy up some copy pasted code Set constness in some places Add a gitignore file Sandro Bonazzola (1): setup: aligned with rpm package

9 years, 8 months

1
0
0 / 0

VERSION

by David Teigland

VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 54ceb344c696560195f973242cb8ce3fc038d360 Author: David Teigland <teigland(a)redhat.com> Date: Mon Aug 18 13:42:30 2014 -0500 release 3.2.0 Signed-off-by: David Teigland <teigland(a)redhat.com> diff --git a/VERSION b/VERSION index fd2a018..944880f 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.1.0 +3.2.0

9 years, 8 months

1
0
0 / 0

reset/sanlk-reset.8 reset/sanlk-resetd.8

by David Teigland

reset/sanlk-reset.8 | 83 +++++++++++++++++++++++++++++++++++++++++++++++++++ reset/sanlk-resetd.8 | 62 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 145 insertions(+) New commits: commit 34bad3485163109ef9b225de03a15cb5afe4a2f9 Author: David Teigland <teigland(a)redhat.com> Date: Thu Aug 14 15:31:52 2014 -0500 reset: add man pages Signed-off-by: David Teigland <teigland(a)redhat.com> diff --git a/reset/sanlk-reset.8 b/reset/sanlk-reset.8 new file mode 100644 index 0000000..468ea0a --- /dev/null +++ b/reset/sanlk-reset.8 @@ -0,0 +1,83 @@ +.TH SANLK-RESET 8 2014-08-14 + +.SH NAME +sanlk-reset \- host reset program + +.SH SYNOPSIS +.B sanlk\-reset +[OPTIONS] +.I action +.IR lockspace_name " ..." + +.SH DESCRIPTION + +The sanlk\-reset program sets events in specified sanlock lockspaces. +Events are defined to cause sanlk\-resetd on another host to: +.br +- use wdmd/watchdog to reset the host +.br +- use /proc/sysrq\-trigger to reboot the host + +Both hosts must be operational and have continued access to a common +lockspace for the reset request to succeed. After setting the event, the +sanlk\-reset program monitors the host status in the sanlock lockspace +until the target host is dead. + +The sanlk\-reset program can also be run on the same host as sanlk\-resetd +to update which lockspaces the local sanlk\-resetd is watching for events. + +.SH OPTIONS +.TP +.B \-\-version, \-V +Print version. + +.TP +.B \-\-help, \-h +Print usage. + +.SS Reset another host + +The event is set in each lockspace specified. The target host may have a +different host id in each lockspace. + +.B sanlk\-reset reset +.IR lockspace_name:host_id " ..." + +.TP +.BI "\-\-host\-id, \-i " num +Host id to reset. (Use only with single lockspace name.) + +.TP +.BI "\-\-generation, \-g " num +Generation of host. (Use only with single lockspace name.) + +.TP +.B \-\-sysrq\-reboot, \-b 0|1 +Enable/Disable (1/0) use of /proc/sysrq\-trigger to reboot. + +.TP +.B \-\-resource-mode, \-R 0|1 +Resource leases are used (1) or not used (0) to protect storage. + +.SS Update the local sanlk\-resetd + +\& + +to watch new lockspaces for reset events: + +.B sanlk\-reset reg +.IR lockspace_name " ..." + +to not watch lockspaces for reset events: + +.B sanlk\-reset end +.IR lockspace_name " ..." + +to clear all lockspaces being watched: + +.B sanlk\-reset clear all + +.SH SEE ALSO +.BR sanlk\-resetd (8) +.BR sanlock (8) +.BR wdmd (8) diff --git a/reset/sanlk-resetd.8 b/reset/sanlk-resetd.8 new file mode 100644 index 0000000..022d9d5 --- /dev/null +++ b/reset/sanlk-resetd.8 @@ -0,0 +1,62 @@ +.TH SANLK\-RESETD 8 2014-08-14 + +.SH NAME +sanlk\-resetd \- host reset daemon + +.SH SYNOPSIS +.B sanlk\-resetd +[OPTIONS] +.IR lockspace_name " ..." + +.SH DESCRIPTION + +The sanlk\-resetd daemon gets events from specified sanlock lockspaces. +Events are defined to cause sanlk\-resetd to: +.br +- use wdmd/watchdog to reset the host +.br +- use /proc/sysrq\-trigger to reboot the host + +The sanlk\-reset program can be run on another host to request that +sanlk\-resetd reset the host it is running on. Both hosts must be +operational and have continued access to a common lockspace for the reset +request to succeed. After setting the event, the sanlk\-reset program +monitors the host status in the sanlock lockspace until the target host is +dead. + +The sanlk\-reset program can also be run on the same host as sanlk\-resetd +to update which lockspaces the local sanlk\-resetd is watching for events. + +.SH OPTIONS +.TP +.B \-\-version, \-V +Print version. + +.TP +.B \-\-help, \-h +Print usage. + +.TP +.B \-\-foreground, \-f +Don't fork. + +.TP +.B \-\-daemon\-debug, \-D +Enable debugging to stderr and don't fork. + +.TP +.B \-\-sysrq\-reboot, \-b 0|1 +Enable/Disable (1/0) use of /proc/sysrq\-trigger to reboot. + +.TP +.BI "\-\-sysrq\-delay, \-d " sec +Delay this many seconds before using /proc/sysrq\-trigger. + +.TP +.B \-\-resource-mode, \-R 0|1 +Resource leases are used (1) or not used (0) to protect storage. + +.SH SEE ALSO +.BR sanlk\-reset (8) +.BR sanlock (8) +.BR wdmd (8)

9 years, 8 months

1
0
0 / 0

python/sanlock.c

by David Teigland

python/sanlock.c | 260 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 260 insertions(+) New commits: commit 1afc0133eb5dee8ce8afbb7b23fc57d166b971a6 Author: Nir Soffer <nsoffer(a)redhat.com> Date: Thu Aug 14 10:35:43 2014 -0500 python: add support for lockspace events Add support for sending events to other hosts and listening for lockspace events. I added thin wrappers for sanlock_reg_event, sanlock_get_event, sanlock_end_event, and sanlock_set_event. Where sanlock C API has unused arguments, the Python bindings do not use them, since we can add them later as optional arguments in a backward compatible manner. This ensures that new code depending on this argument will fail when working with a version that does not provide it. sanlock_get_event returns one event per call. The Python version is easier to use, returning list of events in one call, similar to get_hosts. Signed-off-by: Nir Soffer <nsoffer(a)redhat.com> diff --git a/python/sanlock.c b/python/sanlock.c index b62b8bc..40da92f 100644 --- a/python/sanlock.c +++ b/python/sanlock.c @@ -1243,6 +1243,254 @@ py_exception_errno(PyObject *self, PyBaseExceptionObject *exc_obj) return exc_errno; } +/* reg_event */ +PyDoc_STRVAR(pydoc_reg_event, "\ +reg_event(lockspace) -> int\n\ +Register an event listener for lockspace and return an open file descriptor\n\ +for waiting for lockspace events. When the file descriptor becomes readable,\n\ +you can use get_event to get pending events. When you are done, you must\n\ +unregister the event listener using end_event."); + +static PyObject * +py_reg_event(PyObject *self __unused, PyObject *args) +{ + const char *lockspace = NULL; + int fd = -1; + + if (!PyArg_ParseTuple(args, "s", &lockspace)) + return NULL; + + Py_BEGIN_ALLOW_THREADS + fd = sanlock_reg_event(lockspace, NULL /* event */, 0 /* flags */); + Py_END_ALLOW_THREADS + + if (fd < 0) { + __set_exception(fd, "Unable to register event fd"); + return NULL; + } + + return Py_BuildValue("i", fd); +} + +/* get_event */ +PyDoc_STRVAR(pydoc_get_event, "\ +get_event(fd) -> list\n\ +Get list of lockspace events.\n\ +\n\ +Each event is a dictionary with the following keys:\n\ + from_host_id host id of the host setting this event (int)\n\ + from_generation host generation of the host setting this event (int)\n\ + host_id my host id (int)\n\ + generation my generation where the event was set (int)\n\ + event event number (int)\n\ + data optional event data (int)\n\ +"); + +static PyObject * +py_get_event(PyObject *self __unused, PyObject *args) +{ + int fd = -1; + struct sanlk_host_event he; + uint64_t from_host_id; + uint64_t from_generation; + PyObject *events = NULL; + PyObject *item = NULL; + PyObject *value = NULL; + int rv; + + if (!PyArg_ParseTuple(args, "i", &fd)) + return NULL; + + if ((events = PyList_New(0)) == NULL) + goto exit_fail; + + for (;;) { + Py_BEGIN_ALLOW_THREADS + rv = sanlock_get_event(fd, 0, &he, &from_host_id, &from_generation); + Py_END_ALLOW_THREADS + + if (rv == -EAGAIN) + break; + + if (rv != 0) { + __set_exception(rv, "Unable to get events"); + goto exit_fail; + } + + if ((item = PyDict_New()) == NULL) + goto exit_fail; + + /* from_host_id */ + if ((value = PyLong_FromUnsignedLongLong(from_host_id)) == NULL) + goto exit_fail; + rv = PyDict_SetItemString(item, "from_host_id", value); + Py_DECREF(value); + if (rv != 0) + goto exit_fail; + + /* from_generation */ + if ((value = PyLong_FromUnsignedLongLong(from_generation)) == NULL) + goto exit_fail; + rv = PyDict_SetItemString(item, "from_generation", value); + Py_DECREF(value); + if (rv != 0) + goto exit_fail; + + /* host_id */ + if ((value = PyLong_FromUnsignedLongLong(he.host_id)) == NULL) + goto exit_fail; + rv = PyDict_SetItemString(item, "host_id", value); + Py_DECREF(value); + if (rv != 0) + goto exit_fail; + + /* generation */ + if ((value = PyLong_FromUnsignedLongLong(he.generation)) == NULL) + goto exit_fail; + rv = PyDict_SetItemString(item, "generation", value); + Py_DECREF(value); + if (rv != 0) + goto exit_fail; + + /* event */ + if ((value = PyLong_FromUnsignedLongLong(he.event)) == NULL) + goto exit_fail; + rv = PyDict_SetItemString(item, "event", value); + Py_DECREF(value); + if (rv != 0) + goto exit_fail; + + /* data */ + if ((value = PyLong_FromUnsignedLongLong(he.data)) == NULL) + goto exit_fail; + rv = PyDict_SetItemString(item, "data", value); + Py_DECREF(value); + if (rv != 0) + goto exit_fail; + + if (PyList_Append(events, item) != 0) + goto exit_fail; + + Py_DECREF(item); + item = NULL; + } + + return events; + +exit_fail: + Py_XDECREF(item); + Py_XDECREF(events); + return NULL; +} + +/* end_event */ +PyDoc_STRVAR(pydoc_end_event, "\ +end_event(fd, lockspace)\n\ +Unregister an event listener for lockspace registered with reg_event."); + +static PyObject * +py_end_event(PyObject *self __unused, PyObject *args) +{ + int fd = -1; + const char *lockspace = NULL; + int rv; + + if (!PyArg_ParseTuple(args, "is", &fd, &lockspace)) + return NULL; + + Py_BEGIN_ALLOW_THREADS + rv = sanlock_end_event(fd, lockspace, 0 /* flags */); + Py_END_ALLOW_THREADS + + if (rv < 0) { + __set_exception(rv, "Unable to unregister event fd"); + return NULL; + } + + Py_RETURN_NONE; +} + +/* set_event */ +PyDoc_STRVAR(pydoc_set_event, "\ +set_event(lockspace, host_id, generation, event, data=0, flags=0)\n\ +Set events to hosts on a lockspace.\n\ +\n\ +Arguments\n\ + lockspace lockspace name (str)\n\ + host_id recipient host_id (int)\n\ + generation recipient generation (int)\n\ + event event number (int)\n\ + data optional event data (int)\n\ + flags optional combination of event flags (int)\n\ +\n\ +Flags\n\ + SETEV_CUR_GENERATION if generation is zero, use current host\n\ + generation.\n\ + SETEV_CLEAR_HOSTID clear the host_id in the next renewal so host_id\n\ + will stop seeing this event. If the same event\n\ + was sent to other hosts, they will continue to\n\ + see the event until the event is cleared.\n\ + SETEV_CLEAR_EVENT Clear the event/data/generation values in the\n\ + next renewal, ending this event.\n\ + SETEV_REPLACE_EVENT Replace the existing event/data values of the\n\ + current event. Without this flag, the operation\n\ + will raise SanlockException with -EBUSY error.\n\ + SETEV_ALL_HOSTS set event for all hosts.\n\ +\n\ +Examples\n\ +\n\ + Send event 1 to host 42 on lockspace 'foo', using current host generation:\n\ + set_event('foo', 42, 0, 1, flags=SETEV_CUR_GENERATION)\n\ +\n\ + Send the same event also to host 7 on lockspace 'foo', using current host\n\ + generation. Both host 42 and host 7 will see the same event:\n\ + set_event('foo', 7, 0, 1, flags=SETEV_CUR_GENERATION)\n\ +\n\ + Send event 3 to all hosts on lockspace 'foo', replacing previous events\n\ + sent to other hosts. Note that you must use a valid host_id, but the\n\ + generation is ignored:\n\ + set_event('foo', 1, 0, 3, flags=SETEV_ALL_HOSTS|SETEV_REPLACE_EVENT)\n\ +\n\ +Notes\n\ +\n\ +Sequential set_events with different event/data values, within a short\n\ +time span is likely to produce unwanted results, because the new\n\ +event/data values replace the previous values before the previous values\n\ +have been read.\n\ +\n\ +Unless SETEV_REPLACE_EVENT flag is used, sanlock will raise SanlockException\n\ +with -EBUSY error in this case.\n\ +"); + +static PyObject * +py_set_event(PyObject *self __unused, PyObject *args, PyObject *keywds) +{ + const char *lockspace; + struct sanlk_host_event he = {0}; + uint32_t flags = 0; + int rv; + + static char *kwlist[] = {"lockspace", "host_id", "generation", "event", + "data", "flags", NULL}; + + if (!PyArg_ParseTupleAndKeywords(args, keywds, "sKKK|KI", kwlist, + &lockspace, &he.host_id, &he.generation, &he.event, &he.data, + &flags)) { + return NULL; + } + + Py_BEGIN_ALLOW_THREADS + rv = sanlock_set_event(lockspace, &he, flags); + Py_END_ALLOW_THREADS + + if (rv < 0) { + __set_exception(rv, "Unable to set event"); + return NULL; + } + + Py_RETURN_NONE; +} + static PyMethodDef sanlock_methods[] = { {"register", py_register, METH_NOARGS, pydoc_register}, @@ -1279,6 +1527,11 @@ sanlock_methods[] = { METH_VARARGS|METH_KEYWORDS, pydoc_request}, {"killpath", (PyCFunction) py_killpath, METH_VARARGS|METH_KEYWORDS, pydoc_killpath}, + {"reg_event", (PyCFunction) py_reg_event, METH_VARARGS, pydoc_reg_event}, + {"get_event", (PyCFunction) py_get_event, METH_VARARGS, pydoc_get_event}, + {"end_event", (PyCFunction) py_end_event, METH_VARARGS, pydoc_end_event}, + {"set_event", (PyCFunction) py_set_event, + METH_VARARGS|METH_KEYWORDS, pydoc_set_event}, {NULL, NULL, 0, NULL} }; @@ -1359,5 +1612,12 @@ initsanlock(void) PYSNLK_INIT_ADD_CONSTANT(SANLK_HOST_DEAD, "HOST_DEAD"); PYSNLK_INIT_ADD_CONSTANT(SANLK_HOST_UNKNOWN, "HOST_UNKNOWN"); + /* set event flags */ + PYSNLK_INIT_ADD_CONSTANT(SANLK_SETEV_CUR_GENERATION, "SETEV_CUR_GENERATION"); + PYSNLK_INIT_ADD_CONSTANT(SANLK_SETEV_CLEAR_HOSTID, "SETEV_CLEAR_HOSTID"); + PYSNLK_INIT_ADD_CONSTANT(SANLK_SETEV_CLEAR_EVENT, "SETEV_CLEAR_EVENT"); + PYSNLK_INIT_ADD_CONSTANT(SANLK_SETEV_REPLACE_EVENT, "SETEV_REPLACE_EVENT"); + PYSNLK_INIT_ADD_CONSTANT(SANLK_SETEV_ALL_HOSTS, "SETEV_ALL_HOSTS"); + #undef PYSNLK_INIT_ADD_CONSTANT }

9 years, 8 months

1
0
0 / 0

[PATCH] python: add support for lockspace events

by Nir Soffer

Add support for sending events to other hosts and listening for lockspace events. I added thin wrappers for sanlock_reg_event, sanlock_get_event, sanlock_end_event, and sanlock_set_event. Where sanlock C API has unused arguments, the Python bindings do not use them, since we can add them later as optional arguments in a backward compatible manner. This ensures that new code depending on this argument will fail when working with a version that does not provide it. sanlock_get_event returns one event per call. The Python version is easier to use, returning list of events in one call, similar to get_hosts. Signed-off-by: Nir Soffer <nsoffer(a)redhat.com> --- python/sanlock.c | 260 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 260 insertions(+) diff --git a/python/sanlock.c b/python/sanlock.c index b62b8bc..ad8e179 100644 --- a/python/sanlock.c +++ b/python/sanlock.c @@ -1243,6 +1243,254 @@ py_exception_errno(PyObject *self, PyBaseExceptionObject *exc_obj) return exc_errno; } +/* reg_event */ +PyDoc_STRVAR(pydoc_reg_event, "\ +reg_event(lockspace) -> int\n\ +Register an event listener for lockspace and return an open file descriptor\n\ +for waiting for lockspace events using poll. When the file descriptor becomes\n\ +readble, you can use get_event to get pending events. When you are done, you\n\ +must unregister the event listener using end_event."); + +static PyObject * +py_reg_event(PyObject *self __unused, PyObject *args) +{ + const char *lockspace = NULL; + int fd = -1; + + if (!PyArg_ParseTuple(args, "s", &lockspace)) + return NULL; + + Py_BEGIN_ALLOW_THREADS + fd = sanlock_reg_event(lockspace, NULL /* event */, 0 /* flags */); + Py_END_ALLOW_THREADS + + if (fd < 0) { + __set_exception(fd, "Unable to register event fd"); + return NULL; + } + + return Py_BuildValue("i", fd); +} + +/* get_event */ +PyDoc_STRVAR(pydoc_get_event, "\ +get_event(fd) -> list\n\ +Get list of lockspace events.\n\ +\n\ +Each event is a dictionary with the following keys:\n\ + from_host_id host id of the host setting this event (int)\n\ + from_generation host generation of the host setting this event (int)\n\ + host_id my host id (int)\n\ + generation my generation where the event was set (int)\n\ + event event number (int)\n\ + data optional event data (int)\n\ +"); + +static PyObject * +py_get_event(PyObject *self __unused, PyObject *args) +{ + int fd = -1; + struct sanlk_host_event he; + uint64_t from_host_id; + uint64_t from_generation; + PyObject *events = NULL; + PyObject *item = NULL; + PyObject *value = NULL; + int rv; + + if (!PyArg_ParseTuple(args, "i", &fd)) + return NULL; + + if ((events = PyList_New(0)) == NULL) + goto exit_fail; + + for (;;) { + Py_BEGIN_ALLOW_THREADS + rv = sanlock_get_event(fd, 0, &he, &from_host_id, &from_generation); + Py_END_ALLOW_THREADS + + if (rv == -EAGAIN) + break; + + if (rv != 0) { + __set_exception(rv, "Unable to get events"); + goto exit_fail; + } + + if ((item = PyDict_New()) == NULL) + goto exit_fail; + + /* from_host_id */ + if ((value = PyInt_FromLong(from_host_id)) == NULL) + goto exit_fail; + rv = PyDict_SetItemString(item, "from_host_id", value); + Py_DECREF(value); + if (rv != 0) + goto exit_fail; + + /* from_generation */ + if ((value = PyInt_FromLong(from_generation)) == NULL) + goto exit_fail; + rv = PyDict_SetItemString(item, "from_generation", value); + Py_DECREF(value); + if (rv != 0) + goto exit_fail; + + /* host_id */ + if ((value = PyInt_FromLong(he.host_id)) == NULL) + goto exit_fail; + rv = PyDict_SetItemString(item, "host_id", value); + Py_DECREF(value); + if (rv != 0) + goto exit_fail; + + /* generation */ + if ((value = PyInt_FromLong(he.generation)) == NULL) + goto exit_fail; + rv = PyDict_SetItemString(item, "generation", value); + Py_DECREF(value); + if (rv != 0) + goto exit_fail; + + /* event */ + if ((value = PyInt_FromLong(he.event)) == NULL) + goto exit_fail; + rv = PyDict_SetItemString(item, "event", value); + Py_DECREF(value); + if (rv != 0) + goto exit_fail; + + /* data */ + if ((value = PyInt_FromLong(he.data)) == NULL) + goto exit_fail; + rv = PyDict_SetItemString(item, "data", value); + Py_DECREF(value); + if (rv != 0) + goto exit_fail; + + if (PyList_Append(events, item) != 0) + goto exit_fail; + + Py_DECREF(item); + item = NULL; + } + + return events; + +exit_fail: + Py_XDECREF(item); + Py_XDECREF(events); + return NULL; +} + +/* end_event */ +PyDoc_STRVAR(pydoc_end_event, "\ +end_event(fd, lockspace)\n\ +Unregister an event listener for lockspace registered with reg_event."); + +static PyObject * +py_end_event(PyObject *self __unused, PyObject *args) +{ + int fd = -1; + const char *lockspace = NULL; + int rv; + + if (!PyArg_ParseTuple(args, "is", &fd, &lockspace)) + return NULL; + + Py_BEGIN_ALLOW_THREADS + rv = sanlock_end_event(fd, lockspace, 0 /* flags */); + Py_END_ALLOW_THREADS + + if (rv < 0) { + __set_exception(rv, "Unable to unregister event fd"); + return NULL; + } + + Py_RETURN_NONE; +} + +/* set_event */ +PyDoc_STRVAR(pydoc_set_event, "\ +set_event(lockspace, host_id, generation, event, data=0, flags=0)\n\ +Set events to hosts on a lockspace.\n\ +\n\ +Arguments\n\ + lockspace lockspace name (str)\n\ + host_id recipient host_id (int)\n\ + generation recipient generation (int)\n\ + event event number (int)\n\ + data optional event data (int)\n\ + flags optional combination of event flags (int)\n\ +\n\ +Flags\n\ + SETEV_CUR_GENERATION if generation is zero, use current host\n\ + generation.\n\ + SETEV_CLEAR_HOSTID clear the host_id in the next renewal so host_id\n\ + will stop seeing this event. If the same event\n\ + was sent to other hosts, they will continue to\n\ + see the event until the event is cleared.\n\ + SETEV_CLEAR_EVENT Clear the event/data/generation values in the\n\ + next renewal, ending this event.\n\ + SETEV_REPLACE_EVENT Replace the existing event/data values of the\n\ + current event. Without this flag, the operation\n\ + will raise SanlockException with err EBUSY.\n\ + SETEV_ALL_HOSTS set event for all hosts.\n\ +\n\ +Examples\n\ +\n\ + Send event 1 to host 42 on lockspace 'foo', using current host generation:\n\ + set_event('foo', 42, 0, 1, flags=SETEV_CUR_GENERATION)\n\ +\n\ + Send the same event also to host 7 on lockspace 'foo', using current host\n\ + generation. Both host 42 and host 7 will see the same event:\n\ + set_event('foo', 7, 0, 1, flags=SETEV_CUR_GENERATION)\n\ +\n\ + Send event 3 to all hosts on lockspace 'foo', replacing previous events\n\ + sent to other hosts. Note that you must use a valid host_id, but the\n\ + generation is ignored:\n\ + set_event('foo', 1, 0, 3, flags=SETEV_ALL_HOSTS|SETEV_REPLACE_EVENT)\n\ +\n\ +Notes\n\ +\n\ +Sequential set_events with different event/data values, within a short\n\ +time span is likely to produce unwanted results, because the new\n\ +event/data values replace the previous values before the previous values\n\ +have been read.\n\ +\n\ +Unless SETEV_REPLACE_EVENT flag is used, sanlock will raise SanlockException\n\ +with -EBUSY error in this case.\n\ +"); + +static PyObject * +py_set_event(PyObject *self __unused, PyObject *args, PyObject *keywds) +{ + const char *lockspace; + struct sanlk_host_event he = {0}; + uint32_t flags = 0; + int rv; + + static char *kwlist[] = {"lockspace", "host_id", "generation", "event", + "data", "flags", NULL}; + + if (!PyArg_ParseTupleAndKeywords(args, keywds, "skLL|Li", kwlist, + &lockspace, &he.host_id, &he.generation, &he.event, &he.data, + &flags)) { + return NULL; + } + + Py_BEGIN_ALLOW_THREADS + rv = sanlock_set_event(lockspace, &he, flags); + Py_END_ALLOW_THREADS + + if (rv < 0) { + __set_exception(rv, "Unable to set event"); + return NULL; + } + + Py_RETURN_NONE; +} + static PyMethodDef sanlock_methods[] = { {"register", py_register, METH_NOARGS, pydoc_register}, @@ -1279,6 +1527,11 @@ sanlock_methods[] = { METH_VARARGS|METH_KEYWORDS, pydoc_request}, {"killpath", (PyCFunction) py_killpath, METH_VARARGS|METH_KEYWORDS, pydoc_killpath}, + {"reg_event", (PyCFunction) py_reg_event, METH_VARARGS, pydoc_reg_event}, + {"get_event", (PyCFunction) py_get_event, METH_VARARGS, pydoc_get_event}, + {"end_event", (PyCFunction) py_end_event, METH_VARARGS, pydoc_end_event}, + {"set_event", (PyCFunction) py_set_event, + METH_VARARGS|METH_KEYWORDS, pydoc_set_event}, {NULL, NULL, 0, NULL} }; @@ -1359,5 +1612,12 @@ initsanlock(void) PYSNLK_INIT_ADD_CONSTANT(SANLK_HOST_DEAD, "HOST_DEAD"); PYSNLK_INIT_ADD_CONSTANT(SANLK_HOST_UNKNOWN, "HOST_UNKNOWN"); + /* set event flags */ + PYSNLK_INIT_ADD_CONSTANT(SANLK_SETEV_CUR_GENERATION, "SETEV_CUR_GENERATION"); + PYSNLK_INIT_ADD_CONSTANT(SANLK_SETEV_CLEAR_HOSTID, "SETEV_CLEAR_HOSTID"); + PYSNLK_INIT_ADD_CONSTANT(SANLK_SETEV_CLEAR_EVENT, "SETEV_CLEAR_EVENT"); + PYSNLK_INIT_ADD_CONSTANT(SANLK_SETEV_REPLACE_EVENT, "SETEV_REPLACE_EVENT"); + PYSNLK_INIT_ADD_CONSTANT(SANLK_SETEV_ALL_HOSTS, "SETEV_ALL_HOSTS"); + #undef PYSNLK_INIT_ADD_CONSTANT } -- 1.8.3.1

9 years, 8 months

2
5
0 / 0

src/lockspace.c

by David Teigland

src/lockspace.c | 1 + 1 file changed, 1 insertion(+) New commits: commit 22ad01ac8d1c6c50c2565cf220878384a8c64694 Author: David Teigland <teigland(a)redhat.com> Date: Mon Aug 11 10:51:34 2014 -0500 sanlock: host event struct missing host_id in get_event The destination host_id should be set so the struct from get_event matches the struct from set_event. Signed-off-by: David Teigland <teigland(a)redhat.com> diff --git a/src/lockspace.c b/src/lockspace.c index fe09d99..2db1cce 100644 --- a/src/lockspace.c +++ b/src/lockspace.c @@ -337,6 +337,7 @@ void check_other_leases(struct space *sp, char *buf) */ memset(&he, 0, sizeof(he)); + he.host_id = sp->host_id; he.generation = leader->write_id; he.event = leader->write_generation; he.data = leader->write_timestamp;

9 years, 8 months

3
3
0 / 0

tests/sanlk_events.c

by David Teigland

tests/sanlk_events.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) New commits: commit 80284cf37d2eece9d6990d2a446dec68e82b8480 Author: David Teigland <teigland(a)redhat.com> Date: Tue Aug 12 14:32:42 2014 -0500 tests: update sanlk_events print the full event struct Signed-off-by: David Teigland <teigland(a)redhat.com> diff --git a/tests/sanlk_events.c b/tests/sanlk_events.c index ed78fda..750a31e 100644 --- a/tests/sanlk_events.c +++ b/tests/sanlk_events.c @@ -85,7 +85,9 @@ int main(int argc, char *argv[]) break; } - printf("get_event 0x%llx 0x%llx from %llu %llu\n", + printf("get_event host_id %llu generation %llu event 0x%llx data 0x%llx from %llu %llu\n", + (unsigned long long)he.host_id, + (unsigned long long)he.generation, (unsigned long long)he.event, (unsigned long long)he.data, (unsigned long long)from_host,

9 years, 8 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

sanlock-devel August 2014