Changes to 'refs/tags/sanlock-3.2.1'
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 (464):
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
reset: install man pages
sanlock: print better names in direct read -s
sanlock: log bad delta leases and delta lease owners
sanlock: direct write_leader
release 3.2.1
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 (8):
sanlk-resetd: Allow only privileged user to modify configuration
reset: Use find_ls to remove lockspace by name
python: add support for lockspace events
reset: Require lockspace name for local deamon operations
reset: Add the clear command to the usage
reset: Improve error message when command is missing
reset: Calling with too many lockspaces is a usage error
reset: Normalize exit codes
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
VERSION
by David Teigland
VERSION | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 8915b76f908c5d7a83e7d8f9bb577dd6f477b8e4
Author: David Teigland <teigland(a)redhat.com>
Date: Thu Aug 21 12:59:41 2014 -0500
release 3.2.1
Signed-off-by: David Teigland <teigland(a)redhat.com>
diff --git a/VERSION b/VERSION
index 944880f..e4604e3 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.2.0
+3.2.1
9 years, 8 months
2 commits - src/cmd.c src/delta_lease.c src/delta_lease.h src/direct.c src/direct.h src/lockspace.c src/main.c src/paxos_lease.c src/paxos_lease.h src/sanlock_internal.h
by David Teigland
src/cmd.c | 6
src/delta_lease.c | 24 +++
src/delta_lease.h | 6
src/direct.c | 46 ++++++-
src/direct.h | 6
src/lockspace.c | 70 ++++++++++
src/main.c | 317 +++++++++++++++++++++++++++++++++++++++++--------
src/paxos_lease.c | 21 +++
src/paxos_lease.h | 4
src/sanlock_internal.h | 4
10 files changed, 445 insertions(+), 59 deletions(-)
New commits:
commit c0ca80a304c1af1808c674a363802fa522ed0a53
Author: David Teigland <teigland(a)redhat.com>
Date: Wed Aug 20 15:41:36 2014 -0500
sanlock: direct write_leader
Add a command to write a leader record directly to disk.
This is useful for testing, and to fix corrupted leases.
Signed-off-by: David Teigland <teigland(a)redhat.com>
diff --git a/src/delta_lease.c b/src/delta_lease.c
index 648b767..5b6dc9f 100644
--- a/src/delta_lease.c
+++ b/src/delta_lease.c
@@ -224,6 +224,30 @@ int delta_lease_leader_read(struct task *task, int io_timeout,
}
/*
+ * NB. this should not be used to write the leader record, it is meant only
+ * for manually clobbering the disk to corrupt it for testing, or to manually
+ * repair it after it's corrupted.
+ */
+
+int delta_lease_leader_clobber(struct task *task, int io_timeout,
+ struct sync_disk *disk,
+ uint64_t host_id,
+ struct leader_record *leader,
+ const char *caller)
+{
+ struct leader_record leader_end;
+ int rv;
+
+ leader_record_out(leader, &leader_end);
+
+ rv = write_sector(disk, host_id - 1, (char *)&leader_end, sizeof(struct leader_record),
+ task, io_timeout, caller);
+ if (rv < 0)
+ return rv;
+ return SANLK_OK;
+}
+
+/*
* delta_lease_acquire:
* set the owner of host_id to our_host_name.
*
diff --git a/src/delta_lease.h b/src/delta_lease.h
index f9992d4..968c7c7 100644
--- a/src/delta_lease.h
+++ b/src/delta_lease.h
@@ -56,4 +56,10 @@ int delta_read_lockspace(struct task *task,
int io_timeout,
int *io_timeout_ret);
+int delta_lease_leader_clobber(struct task *task, int io_timeout,
+ struct sync_disk *disk,
+ uint64_t host_id,
+ struct leader_record *leader,
+ const char *caller);
+
#endif
diff --git a/src/direct.c b/src/direct.c
index 24777ad..8813b2f 100644
--- a/src/direct.c
+++ b/src/direct.c
@@ -78,6 +78,7 @@ static int do_paxos_action(int action, struct task *task, int io_timeout,
int max_hosts, int num_hosts,
uint64_t local_host_id,
uint64_t local_host_generation,
+ struct leader_record *leader_in,
struct leader_record *leader_ret)
{
struct token *token;
@@ -138,6 +139,10 @@ static int do_paxos_action(int action, struct task *task, int io_timeout,
case ACT_READ_LEADER:
rv = paxos_lease_leader_read(task, token, &leader, "direct_read_leader");
break;
+
+ case ACT_WRITE_LEADER:
+ rv = paxos_lease_leader_clobber(task, token, leader_in, "direct_clobber");
+ break;
}
close_disks(token->disks, token->r.num_disks);
@@ -167,6 +172,7 @@ int direct_acquire(struct task *task, int io_timeout,
return do_paxos_action(ACT_ACQUIRE, task, io_timeout, res,
-1, num_hosts,
local_host_id, local_host_generation,
+ NULL,
leader_ret);
}
@@ -177,6 +183,7 @@ int direct_release(struct task *task, int io_timeout,
return do_paxos_action(ACT_RELEASE, task, io_timeout, res,
-1, -1,
0, 0,
+ NULL,
leader_ret);
}
@@ -186,6 +193,7 @@ static int do_delta_action(int action,
struct sanlk_lockspace *ls,
int max_hosts,
char *our_host_name,
+ struct leader_record *leader_in,
struct leader_record *leader_ret)
{
struct leader_record leader;
@@ -266,6 +274,11 @@ static int do_delta_action(int action,
&leader,
"direct_read");
break;
+ case ACT_WRITE_LEADER:
+ rv = delta_lease_leader_clobber(task, io_timeout, &sd,
+ ls->host_id,
+ leader_in,
+ "direct_clobber");
}
close_disks(&sd, 1);
@@ -289,17 +302,17 @@ static int do_delta_action(int action,
int direct_acquire_id(struct task *task, int io_timeout, struct sanlk_lockspace *ls,
char *our_host_name)
{
- return do_delta_action(ACT_ACQUIRE_ID, task, io_timeout, ls, -1, our_host_name, NULL);
+ return do_delta_action(ACT_ACQUIRE_ID, task, io_timeout, ls, -1, our_host_name, NULL, NULL);
}
int direct_release_id(struct task *task, int io_timeout, struct sanlk_lockspace *ls)
{
- return do_delta_action(ACT_RELEASE_ID, task, io_timeout, ls, -1, NULL, NULL);
+ return do_delta_action(ACT_RELEASE_ID, task, io_timeout, ls, -1, NULL, NULL, NULL);
}
int direct_renew_id(struct task *task, int io_timeout, struct sanlk_lockspace *ls)
{
- return do_delta_action(ACT_RENEW_ID, task, io_timeout, ls, -1, NULL, NULL);
+ return do_delta_action(ACT_RENEW_ID, task, io_timeout, ls, -1, NULL, NULL, NULL);
}
int direct_align(struct sync_disk *disk)
@@ -320,7 +333,7 @@ int direct_write_lockspace(struct task *task, struct sanlk_lockspace *ls,
return -1;
return do_delta_action(ACT_DIRECT_INIT, task, io_timeout, ls,
- max_hosts, NULL, NULL);
+ max_hosts, NULL, NULL, NULL);
}
int direct_write_resource(struct task *task, struct sanlk_resource *res,
@@ -336,7 +349,7 @@ int direct_write_resource(struct task *task, struct sanlk_resource *res,
return -ENODEV;
return do_paxos_action(ACT_DIRECT_INIT, task, 0, res,
- max_hosts, num_hosts, 0, 0, NULL);
+ max_hosts, num_hosts, 0, 0, NULL, NULL);
}
int direct_read_leader(struct task *task,
@@ -348,11 +361,30 @@ int direct_read_leader(struct task *task,
int rv = -1;
if (ls && ls->host_id_disk.path[0])
- rv = do_delta_action(ACT_READ_LEADER, task, io_timeout, ls, -1, NULL, leader_ret);
+ rv = do_delta_action(ACT_READ_LEADER, task, io_timeout, ls, -1, NULL, NULL, leader_ret);
else if (res)
rv = do_paxos_action(ACT_READ_LEADER, task, io_timeout, res,
- -1, -1, 0, 0, leader_ret);
+ -1, -1, 0, 0, NULL, leader_ret);
+ return rv;
+}
+
+int direct_write_leader(struct task *task,
+ int io_timeout,
+ struct sanlk_lockspace *ls,
+ struct sanlk_resource *res,
+ struct leader_record *leader)
+{
+ int rv = -1;
+
+ if (ls && ls->host_id_disk.path[0]) {
+ rv = do_delta_action(ACT_WRITE_LEADER, task, io_timeout, ls, -1, NULL, leader, NULL);
+
+ } else if (res) {
+ rv = do_paxos_action(ACT_WRITE_LEADER, task, io_timeout, res,
+ -1, -1, 0, 0, leader, NULL);
+ }
+
return rv;
}
diff --git a/src/direct.h b/src/direct.h
index dd7abbb..af2c4d1 100644
--- a/src/direct.h
+++ b/src/direct.h
@@ -45,6 +45,12 @@ int direct_read_leader(struct task *task, int io_timeout,
struct sanlk_resource *res,
struct leader_record *leader_ret);
+int direct_write_leader(struct task *task,
+ int io_timeout,
+ struct sanlk_lockspace *ls,
+ struct sanlk_resource *res,
+ struct leader_record *leader);
+
int direct_dump(struct task *task, char *dump_path, int force_mode);
int direct_next_free(struct task *task, char *path);
diff --git a/src/main.c b/src/main.c
index f729540..5d3b270 100644
--- a/src/main.c
+++ b/src/main.c
@@ -53,6 +53,7 @@
#include "cmd.h"
#include "helper.h"
#include "timeouts.h"
+#include "paxos_lease.h"
#define ONEMB 1048576
@@ -2006,6 +2007,8 @@ static int read_command_line(int argc, char *argv[])
com.action = ACT_NEXT_FREE;
else if (!strcmp(act, "read_leader"))
com.action = ACT_READ_LEADER;
+ else if (!strcmp(act, "write_leader"))
+ com.action = ACT_WRITE_LEADER;
else if (!strcmp(act, "acquire"))
com.action = ACT_ACQUIRE;
else if (!strcmp(act, "release"))
@@ -2071,6 +2074,9 @@ static int read_command_line(int argc, char *argv[])
case 'S':
log_syslog_priority = atoi(optionarg);
break;
+ case 'F':
+ com.file_path = strdup(optionarg);
+ break;
case 'a':
com.all = atoi(optionarg);
com.aio_arg = atoi(optionarg);
@@ -2671,23 +2677,269 @@ static int do_client(void)
return rv;
}
+#define MAX_LINE 128
+
+static int read_file_leader(struct leader_record *leader, int is_ls)
+{
+ FILE *file;
+ char line[MAX_LINE];
+ char field[MAX_LINE];
+ char val[MAX_LINE];
+ uint32_t checksum = 0;
+ uint32_t new_checksum;
+ struct leader_record lr;
+ int rv;
+
+ file = fopen(com.file_path, "r");
+ if (!file) {
+ log_tool("open error %d %s", errno, com.file_path);
+ return -1;
+ }
+
+ memcpy(&lr, leader, sizeof(lr));
+
+ memset(line, 0, sizeof(line));
+
+ while (fgets(line, MAX_LINE, file)) {
+
+ memset(field, 0, sizeof(field));
+ memset(val, 0, sizeof(val));
+
+ rv = sscanf(line, "%s %s", field, val);
+ if (rv != 2) {
+ log_tool("ignore line: \"%s\"", line);
+ continue;
+ }
+
+ if (!strcmp(field, "magic")) {
+ sscanf(val, "0x%x", &lr.magic);
+
+ } else if (!strcmp(field, "version")) {
+ sscanf(val, "0x%x", &lr.version);
+
+ } else if (!strcmp(field, "flags")) {
+ sscanf(val, "0x%x", &lr.flags);
+
+ } else if (!strcmp(field, "sector_size")) {
+ sscanf(val, "%u", &lr.sector_size);
+
+ } else if (!strcmp(field, "num_hosts")) {
+ sscanf(val, "%llu", (unsigned long long *)&lr.num_hosts);
+
+ } else if (!strcmp(field, "max_hosts")) {
+ sscanf(val, "%llu", (unsigned long long *)&lr.max_hosts);
+
+ } else if (!strcmp(field, "owner_id")) {
+ sscanf(val, "%llu", (unsigned long long *)&lr.owner_id);
+
+ } else if (!strcmp(field, "owner_generation")) {
+ sscanf(val, "%llu", (unsigned long long *)&lr.owner_generation);
+
+ } else if (!strcmp(field, "lver")) {
+ sscanf(val, "%llu", (unsigned long long *)&lr.lver);
+
+ } else if (!strcmp(field, "space_name")) {
+ strncpy(lr.space_name, val, NAME_ID_SIZE);
+
+ } else if (!strcmp(field, "resource_name")) {
+ strncpy(lr.resource_name, val, NAME_ID_SIZE);
+
+ } else if (!strcmp(field, "timestamp")) {
+ sscanf(val, "%llu", (unsigned long long *)&lr.timestamp);
+
+ } else if (!strcmp(field, "checksum")) {
+ sscanf(val, "0x%x", &checksum);
+
+ } else if (!strcmp(field, "io_timeout")) {
+ sscanf(val, "%hu", &lr.io_timeout);
+
+ } else if (is_ls && !strcmp(field, "extra1")) {
+ sscanf(val, "%llu", (unsigned long long *)&lr.write_id);
+
+ } else if (is_ls && !strcmp(field, "extra2")) {
+ sscanf(val, "%llu", (unsigned long long *)&lr.write_generation);
+
+ } else if (is_ls && !strcmp(field, "extra3")) {
+ sscanf(val, "%llu", (unsigned long long *)&lr.write_timestamp);
+
+ } else if (!is_ls && !strcmp(field, "write_id")) {
+ sscanf(val, "%llu", (unsigned long long *)&lr.write_id);
+
+ } else if (!is_ls && !strcmp(field, "write_generation")) {
+ sscanf(val, "%llu", (unsigned long long *)&lr.write_generation);
+
+ } else if (!is_ls && !strcmp(field, "write_timestamp")) {
+ sscanf(val, "%llu", (unsigned long long *)&lr.write_timestamp);
+ } else {
+ log_tool("ignore field: \"%s\"", field);
+ }
+
+ memset(line, 0, sizeof(line));
+ }
+
+ new_checksum = leader_checksum(&lr);
+
+ if (!com.force_mode) {
+ lr.checksum = new_checksum;
+ log_tool("use new generated checksum %x", new_checksum);
+ } else {
+ lr.checksum = checksum;
+ log_tool("warning: using specified checksum %x (generated is %x)",
+ checksum, new_checksum);
+ }
+
+ memcpy(leader, &lr, sizeof(lr));
+ return 0;
+}
+
+static void print_leader(struct leader_record *leader, int is_ls)
+{
+ log_tool("magic 0x%0x", leader->magic);
+ log_tool("version 0x%x", leader->version);
+ log_tool("flags 0x%x", leader->flags);
+ log_tool("sector_size %u", leader->sector_size);
+ log_tool("num_hosts %llu", (unsigned long long)leader->num_hosts);
+ log_tool("max_hosts %llu", (unsigned long long)leader->max_hosts);
+ log_tool("owner_id %llu", (unsigned long long)leader->owner_id);
+ log_tool("owner_generation %llu", (unsigned long long)leader->owner_generation);
+ log_tool("lver %llu", (unsigned long long)leader->lver);
+ log_tool("space_name %.48s", leader->space_name);
+ log_tool("resource_name %.48s", leader->resource_name);
+ log_tool("timestamp %llu", (unsigned long long)leader->timestamp);
+ log_tool("checksum 0x%0x", leader->checksum);
+ log_tool("io_timeout %u", leader->io_timeout);
+
+ if (!is_ls) {
+ log_tool("write_id %llu", (unsigned long long)leader->write_id);
+ log_tool("write_generation %llu", (unsigned long long)leader->write_generation);
+ log_tool("write_timestamp %llu", (unsigned long long)leader->write_timestamp);
+ } else {
+ log_tool("extra1 %llu", (unsigned long long)leader->write_id);
+ log_tool("extra2 %llu", (unsigned long long)leader->write_generation);
+ log_tool("extra3 %llu", (unsigned long long)leader->write_timestamp);
+ }
+}
+
+static int do_direct_read_leader(void)
+{
+ struct leader_record leader;
+ int rv;
+
+ rv = direct_read_leader(&main_task, com.io_timeout_arg,
+ &com.lockspace, com.res_args[0],
+ &leader);
+
+ log_tool("read_leader done %d", rv);
+
+ print_leader(&leader, com.res_args[0] ? 0 : 1);
+
+ return rv;
+}
+
+/*
+ * read the current leader record from disk, override any values found in
+ * the file, write back the result.
+ */
+
+static int do_direct_write_leader(void)
+{
+ struct leader_record leader;
+ char *res_str = NULL;
+ int is_ls = com.res_args[0] ? 0 : 1;
+ int rv;
+
+ memset(&leader, 0, sizeof(leader));
+
+ direct_read_leader(&main_task, com.io_timeout_arg,
+ &com.lockspace, com.res_args[0],
+ &leader);
+
+ rv = read_file_leader(&leader, is_ls);
+ if (rv < 0)
+ return rv;
+
+ /* make a record in the logs that this has been done */
+
+ if (is_ls) {
+ syslog(LOG_WARNING, "write_leader lockspace %.48s:%llu:%s:%llu",
+ com.lockspace.name,
+ (unsigned long long)com.lockspace.host_id,
+ com.lockspace.host_id_disk.path,
+ (unsigned long long)com.lockspace.host_id_disk.offset);
+ } else {
+ rv = sanlock_res_to_str(com.res_args[0], &res_str);
+ if (rv < 0) {
+ syslog(LOG_WARNING, "write_leader resource %.48s:%.48s",
+ com.res_args[0]->lockspace_name, com.res_args[0]->name);
+ } else {
+ syslog(LOG_WARNING, "write_leader resource %s", res_str);
+ }
+ }
+
+ rv = direct_write_leader(&main_task, com.io_timeout_arg,
+ &com.lockspace, com.res_args[0],
+ &leader);
+
+ log_tool("write_leader done %d", rv);
+
+ print_leader(&leader, is_ls);
+
+ if (res_str)
+ free(res_str);
+
+ return rv;
+}
+
+static int do_direct_init(void)
+{
+ char *res_str = NULL;
+ int rv;
+
+ if (com.lockspace.host_id_disk.path[0]) {
+ syslog(LOG_WARNING, "init lockspace %.48s:%llu:%s:%llu",
+ com.lockspace.name,
+ (unsigned long long)com.lockspace.host_id,
+ com.lockspace.host_id_disk.path,
+ (unsigned long long)com.lockspace.host_id_disk.offset);
+
+ rv = direct_write_lockspace(&main_task, &com.lockspace,
+ com.max_hosts, com.io_timeout_arg);
+ } else {
+ rv = sanlock_res_to_str(com.res_args[0], &res_str);
+ if (rv < 0) {
+ syslog(LOG_WARNING, "init resource %.48s:%.48s",
+ com.res_args[0]->lockspace_name, com.res_args[0]->name);
+ } else {
+ syslog(LOG_WARNING, "init resource %s", res_str);
+ }
+
+ rv = direct_write_resource(&main_task, com.res_args[0],
+ com.max_hosts, com.num_hosts);
+ }
+
+ log_tool("init done %d", rv);
+
+ if (res_str)
+ free(res_str);
+
+ return rv;
+}
+
static int do_direct(void)
{
struct leader_record leader;
int rv;
+ /* we want a record of any out-of-band changes to disk */
+ openlog("sanlock-direct", LOG_CONS | LOG_PID, LOG_DAEMON);
+
setup_task_aio(&main_task, com.aio_arg, DIRECT_AIO_CB_SIZE);
sprintf(main_task.name, "%s", "main_direct");
switch (com.action) {
+
case ACT_DIRECT_INIT:
- if (com.lockspace.host_id_disk.path[0])
- rv = direct_write_lockspace(&main_task, &com.lockspace,
- com.max_hosts, com.io_timeout_arg);
- else
- rv = direct_write_resource(&main_task, com.res_args[0],
- com.max_hosts, com.num_hosts);
- log_tool("init done %d", rv);
+ rv = do_direct_init();
break;
case ACT_DUMP:
@@ -2699,49 +2951,15 @@ static int do_direct(void)
break;
case ACT_READ_LEADER:
- rv = direct_read_leader(&main_task, com.io_timeout_arg,
- &com.lockspace, com.res_args[0],
- &leader);
- log_tool("read_leader done %d", rv);
- log_tool("magic 0x%0x", leader.magic);
- log_tool("version 0x%x", leader.version);
- log_tool("flags 0x%x", leader.flags);
- log_tool("sector_size %u", leader.sector_size);
- log_tool("num_hosts %llu",
- (unsigned long long)leader.num_hosts);
- log_tool("max_hosts %llu",
- (unsigned long long)leader.max_hosts);
- log_tool("owner_id %llu",
- (unsigned long long)leader.owner_id);
- log_tool("owner_generation %llu",
- (unsigned long long)leader.owner_generation);
- log_tool("lver %llu",
- (unsigned long long)leader.lver);
- log_tool("space_name %.48s", leader.space_name);
- log_tool("resource_name %.48s", leader.resource_name);
- log_tool("timestamp %llu",
- (unsigned long long)leader.timestamp);
- log_tool("checksum 0x%0x", leader.checksum);
- log_tool("io_timeout %u", leader.io_timeout);
-
- if (com.res_args[0]) {
- log_tool("write_id %llu",
- (unsigned long long)leader.write_id);
- log_tool("write_generation %llu",
- (unsigned long long)leader.write_generation);
- log_tool("write_timestamp %llu",
- (unsigned long long)leader.write_timestamp);
- } else {
- log_tool("extra1 %llu",
- (unsigned long long)leader.write_id);
- log_tool("extra2 %llu",
- (unsigned long long)leader.write_generation);
- log_tool("extra3 %llu",
- (unsigned long long)leader.write_timestamp);
- }
+ rv = do_direct_read_leader();
+ break;
+
+ case ACT_WRITE_LEADER:
+ rv = do_direct_write_leader();
break;
case ACT_ACQUIRE:
+ syslog(LOG_WARNING, "acquire");
rv = direct_acquire(&main_task, com.io_timeout_arg,
com.res_args[0], com.num_hosts,
com.host_id, com.host_generation,
@@ -2750,12 +2968,14 @@ static int do_direct(void)
break;
case ACT_RELEASE:
+ syslog(LOG_WARNING, "release");
rv = direct_release(&main_task, com.io_timeout_arg,
com.res_args[0], &leader);
log_tool("release done %d", rv);
break;
case ACT_ACQUIRE_ID:
+ syslog(LOG_WARNING, "acquire_id");
setup_host_name();
rv = direct_acquire_id(&main_task, com.io_timeout_arg,
@@ -2764,11 +2984,13 @@ static int do_direct(void)
break;
case ACT_RELEASE_ID:
+ syslog(LOG_WARNING, "release_id");
rv = direct_release_id(&main_task, com.io_timeout_arg, &com.lockspace);
log_tool("release_id done %d", rv);
break;
case ACT_RENEW_ID:
+ syslog(LOG_WARNING, "renew_id");
rv = direct_renew_id(&main_task, com.io_timeout_arg, &com.lockspace);
log_tool("rewew_id done %d", rv);
break;
@@ -2779,6 +3001,7 @@ static int do_direct(void)
}
close_task_aio(&main_task);
+ closelog();
return rv;
}
diff --git a/src/paxos_lease.c b/src/paxos_lease.c
index 33dacb6..7b8e95a 100644
--- a/src/paxos_lease.c
+++ b/src/paxos_lease.c
@@ -215,6 +215,27 @@ static int write_leader(struct task *task,
return rv;
}
+/*
+ * NB. this should not be used to write the leader record, it is meant only
+ * for manually clobbering the disk to corrupt it for testing, or to manually
+ * repair it after it's corrupted.
+ */
+
+int paxos_lease_leader_clobber(struct task *task,
+ struct token *token,
+ struct leader_record *leader,
+ const char *caller)
+{
+ struct leader_record lr_end;
+ int rv;
+
+ leader_record_out(leader, &lr_end);
+
+ rv = write_sector(&token->disks[0], 0, (char *)&lr_end, sizeof(struct leader_record),
+ task, token->io_timeout, caller);
+ return rv;
+}
+
#if 0
static int read_dblock(struct task *task,
struct sync_disk *disk,
diff --git a/src/paxos_lease.h b/src/paxos_lease.h
index 95b7dcd..84082f4 100644
--- a/src/paxos_lease.h
+++ b/src/paxos_lease.h
@@ -60,4 +60,8 @@ int paxos_erase_dblock(struct task *task,
struct token *token,
uint64_t host_id);
+int paxos_lease_leader_clobber(struct task *task,
+ struct token *token,
+ struct leader_record *leader,
+ const char *caller);
#endif
diff --git a/src/sanlock_internal.h b/src/sanlock_internal.h
index c6aabad..475af18 100644
--- a/src/sanlock_internal.h
+++ b/src/sanlock_internal.h
@@ -318,6 +318,7 @@ struct command_line {
int sh_retries;
uint32_t force_mode;
char our_host_name[SANLK_NAME_LEN+1];
+ char *file_path;
char *dump_path;
struct sanlk_lockspace lockspace; /* -s LOCKSPACE */
struct sanlk_resource *res_args[SANLK_MAX_RESOURCES]; /* -r RESOURCE */
@@ -360,6 +361,7 @@ enum {
ACT_VERSION,
ACT_SET_EVENT,
ACT_SET_CONFIG,
+ ACT_WRITE_LEADER,
};
EXTERN int external_shutdown;
commit dbb5e18a0a23a5dfeb8b0b6045e9fa9da8405b33
Author: David Teigland <teigland(a)redhat.com>
Date: Tue Aug 19 15:39:34 2014 -0500
sanlock: log bad delta leases and delta lease owners
Other delta leases in a lockspace are monitored for liveness,
which includes checking and saving the delta lease timestamp.
This adds a check of the delta lease's magic number and
lockspace name, and logs an error if they are not correct.
This will help debugging if a delta lease is corrupted.
This also adds an entry to sanlock.log that shows the owner
information for each delta lease. This is logged whenever
the sanlock daemon encounters new owner information for a
host in a lockspace.
Signed-off-by: David Teigland <teigland(a)redhat.com>
diff --git a/src/cmd.c b/src/cmd.c
index c67b88c..648ea7c 100644
--- a/src/cmd.c
+++ b/src/cmd.c
@@ -2190,14 +2190,16 @@ static int print_state_host(struct host_status *hs, char *str)
"owner_id=%llu "
"owner_generation=%llu "
"timestamp=%llu "
- "io_timeout=%u",
+ "io_timeout=%u "
+ "owner_name=%.48s",
(unsigned long long)hs->last_check,
(unsigned long long)hs->last_live,
(unsigned long long)hs->last_req,
(unsigned long long)hs->owner_id,
(unsigned long long)hs->owner_generation,
(unsigned long long)hs->timestamp,
- hs->io_timeout);
+ hs->io_timeout,
+ hs->owner_name);
return strlen(str) + 1;
}
diff --git a/src/lockspace.c b/src/lockspace.c
index 2db1cce..9322861 100644
--- a/src/lockspace.c
+++ b/src/lockspace.c
@@ -311,16 +311,80 @@ void check_other_leases(struct space *sp, char *buf)
leader_record_in(leader_end, &leader_in);
leader = &leader_in;
+ /*
+ * If this lease has invalid fields, log an error. Limit the logging
+ * frequency to avoid blowing up logs if some lease is left in a bad
+ * state for a long time. Should we check other fields in addition
+ * to magic and space_name?
+ */
+ if ((leader->magic != DELTA_DISK_MAGIC) || (strncmp(leader->space_name, sp->space_name, NAME_ID_SIZE))) {
+ if (!hs->lease_bad || !(hs->lease_bad % 100)) {
+ log_erros(sp, "check_other_lease invalid for host %llu %llu ts %llu name %.48s in %.48s",
+ (unsigned long long)hs->owner_id,
+ (unsigned long long)hs->owner_generation,
+ (unsigned long long)hs->timestamp,
+ hs->owner_name,
+ sp->space_name);
+ log_erros(sp, "check_other_lease leader %x owner %llu %llu ts %llu sn %.48s rn %.48s",
+ leader->magic,
+ (unsigned long long)leader->owner_id,
+ (unsigned long long)leader->owner_generation,
+ (unsigned long long)leader->timestamp,
+ leader->space_name,
+ leader->resource_name);
+ }
+ hs->lease_bad++;
+ if (!hs->lease_bad)
+ hs->lease_bad++;
+ } else {
+ if (hs->lease_bad) {
+ log_erros(sp, "check_other_lease corrected for host %llu %llu ts %llu name %.48s in %.48s",
+ (unsigned long long)hs->owner_id,
+ (unsigned long long)hs->owner_generation,
+ (unsigned long long)hs->timestamp,
+ hs->owner_name,
+ sp->space_name);
+ }
+ hs->lease_bad = 0;
+ }
+
+ /*
+ * Save a record of each new host instance to help with debugging.
+ */
+ if (!hs->lease_bad &&
+ (strncmp(hs->owner_name, leader->resource_name, NAME_ID_SIZE) ||
+ (hs->owner_generation != leader->owner_generation))) {
+ log_level(sp->space_id, 0, NULL, LOG_WARNING,
+ "host %llu %llu %llu %.48s",
+ (unsigned long long)leader->owner_id,
+ (unsigned long long)leader->owner_generation,
+ (unsigned long long)leader->timestamp,
+ leader->resource_name);
+ strncpy(hs->owner_name, leader->resource_name, NAME_ID_SIZE);
+ }
+
if (hs->owner_id == leader->owner_id &&
hs->owner_generation == leader->owner_generation &&
hs->timestamp == leader->timestamp) {
continue;
}
- hs->owner_id = leader->owner_id;
- hs->owner_generation = leader->owner_generation;
+ /*
+ * Replacing good values with potentially bad values
+ * would have no purpose, and would confuse things, so
+ * don't replace these fields if the lease is bad.
+ * But, continue to update the timestamp because we don't
+ * want to consider the host to be dead if the lease
+ * is being renewed, even if the lease has bad fields.
+ */
+ if (!hs->lease_bad) {
+ hs->owner_id = leader->owner_id;
+ hs->owner_generation = leader->owner_generation;
+ strncpy(hs->owner_name, leader->resource_name, NAME_ID_SIZE);
+ hs->io_timeout = leader->io_timeout;
+ }
+
hs->timestamp = leader->timestamp;
- hs->io_timeout = leader->io_timeout;
hs->last_live = now;
if (i+1 == sp->host_id)
diff --git a/src/sanlock_internal.h b/src/sanlock_internal.h
index 07d0029..c6aabad 100644
--- a/src/sanlock_internal.h
+++ b/src/sanlock_internal.h
@@ -156,6 +156,8 @@ struct host_status {
uint64_t timestamp; /* remote monotime */
uint64_t set_bit_time;
uint16_t io_timeout;
+ uint16_t lease_bad;
+ char owner_name[NAME_ID_SIZE];
};
/* The max number of connections that can get events for a lockspace. */
9 years, 8 months
src/main.c
by David Teigland
src/main.c | 22 ++++++++++++++++------
1 file changed, 16 insertions(+), 6 deletions(-)
New commits:
commit d90efcd4d2595b2af54f998fb9680e4ee560c6ab
Author: David Teigland <teigland(a)redhat.com>
Date: Tue Aug 19 13:44:26 2014 -0500
sanlock: print better names in direct read -s
sanlock direct read -s LOCKSPACE
was printing "write_id, write_generation, write_timestamp"
field names which are relevant only for paxos leases.
Print "extra1, extra2, extra3" as the field names when
reading a lockspace.
Signed-off-by: David Teigland <teigland(a)redhat.com>
diff --git a/src/main.c b/src/main.c
index 0f6332a..f729540 100644
--- a/src/main.c
+++ b/src/main.c
@@ -2723,12 +2723,22 @@ static int do_direct(void)
(unsigned long long)leader.timestamp);
log_tool("checksum 0x%0x", leader.checksum);
log_tool("io_timeout %u", leader.io_timeout);
- log_tool("write_id %llu",
- (unsigned long long)leader.write_id);
- log_tool("write_generation %llu",
- (unsigned long long)leader.write_generation);
- log_tool("write_timestamp %llu",
- (unsigned long long)leader.write_timestamp);
+
+ if (com.res_args[0]) {
+ log_tool("write_id %llu",
+ (unsigned long long)leader.write_id);
+ log_tool("write_generation %llu",
+ (unsigned long long)leader.write_generation);
+ log_tool("write_timestamp %llu",
+ (unsigned long long)leader.write_timestamp);
+ } else {
+ log_tool("extra1 %llu",
+ (unsigned long long)leader.write_id);
+ log_tool("extra2 %llu",
+ (unsigned long long)leader.write_generation);
+ log_tool("extra3 %llu",
+ (unsigned long long)leader.write_timestamp);
+ }
break;
case ACT_ACQUIRE:
9 years, 8 months
4 commits - reset/sanlk_reset.c
by David Teigland
reset/sanlk_reset.c | 36 ++++++++++++++++++++++--------------
1 file changed, 22 insertions(+), 14 deletions(-)
New commits:
commit 2d6fdc4685567214f0688223b53e2e05f110e9b6
Author: Nir Soffer <nsoffer(a)redhat.com>
Date: Tue Aug 19 11:21:52 2014 -0500
reset: Normalize exit codes
Previously some usage error were treated as failures, and some failures
caused the program to exit with strange exit codes (e.g. 255). This
patch normalizes the exit code to make sanlk-reset easier to consume by
other programs.
Exit codes:
0 program succeeded
1 program failed
2 program used incorrectly
Signed-off-by: Nir Soffer <nsoffer(a)redhat.com>
diff --git a/reset/sanlk_reset.c b/reset/sanlk_reset.c
index 51e9a14..9b121e8 100644
--- a/reset/sanlk_reset.c
+++ b/reset/sanlk_reset.c
@@ -38,6 +38,7 @@ static struct sockaddr_un update_addr;
static socklen_t update_addrlen;
#include "sanlk_reset.h"
+#define EXIT_USAGE 2
#define MAX_LS 64
static char *prog_name;
@@ -430,7 +431,7 @@ static int update_local_daemon(char *cmd)
s = setup_resetd_socket();
if (s < 0) {
fprintf(stderr, "Failed to create socket %d\n", s);
- return s;
+ return EXIT_FAILURE;
}
for (i = 0; i < ls_count; i++) {
@@ -440,13 +441,13 @@ static int update_local_daemon(char *cmd)
rv = sendto(s, buf, UPDATE_SIZE, 0, (struct sockaddr *)&update_addr, update_addrlen);
if (rv < 0) {
printf("Failed to update local sanlk-resetd: %s\n", strerror(errno));
- return rv;
+ return EXIT_FAILURE;
} else {
printf("Updated %s %s\n", cmd, ls_names[i]);
}
}
- return 0;
+ return EXIT_SUCCESS;
}
static void usage(void)
@@ -499,7 +500,7 @@ int main(int argc, char *argv[])
if (argc < 2) {
usage();
- exit(EXIT_FAILURE);
+ exit(EXIT_USAGE);
}
static struct option long_options[] = {
@@ -549,7 +550,7 @@ int main(int argc, char *argv[])
case '?':
default:
usage();
- exit(2);
+ exit(EXIT_USAGE);
}
}
@@ -575,7 +576,7 @@ int main(int argc, char *argv[])
if (!ls_count) {
fprintf(stderr, "lockspace_name is required\n");
- exit(2);
+ exit(EXIT_USAGE);
}
/*
@@ -592,12 +593,12 @@ int main(int argc, char *argv[])
if (strcmp(cmd, "reset")) {
fprintf(stderr, "unknown command\n");
- exit(2);
+ exit(EXIT_USAGE);
}
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);
+ exit(EXIT_USAGE);
}
for (i = 0; i < ls_count; i++) {
@@ -612,7 +613,7 @@ int main(int argc, char *argv[])
if (ls_hostids[i] < 1 || ls_hostids[i] > 2000) {
fprintf(stderr, "invalid host_id %d", ls_hostids[i]);
- exit(2);
+ exit(EXIT_USAGE);
}
}
commit dd664772005ded090404d17380a9bc984ac41cb8
Author: Nir Soffer <nsoffer(a)redhat.com>
Date: Tue Aug 19 11:19:56 2014 -0500
reset: Calling with too many lockspaces is a usage error
Previously we complained about ignoring lockspaces, but continue the
operation as usaual, so another program running the sanlk-reset tool
cannot detect the usage error.
Now this will fail with exit code 2 and this message:
too many lockspaces (max 64)
Signed-off-by: Nir Soffer <nsoffer(a)redhat.com>
diff --git a/reset/sanlk_reset.c b/reset/sanlk_reset.c
index 7a15ff9..51e9a14 100644
--- a/reset/sanlk_reset.c
+++ b/reset/sanlk_reset.c
@@ -565,7 +565,8 @@ int main(int argc, char *argv[])
for (i = optind; i < argc; i++) {
if (ls_count == MAX_LS) {
- fprintf(stderr, "ignore lockspace_name %s\n", argv[i]);
+ fprintf(stderr, "too many lockspaces (max %d)\n", MAX_LS);
+ exit(2);
} else {
ls_names[ls_count] = argv[i];
ls_count++;
commit ba24c1d230932a947324ea916cd2b932f2948f69
Author: Nir Soffer <nsoffer(a)redhat.com>
Date: Tue Aug 19 01:56:28 2014 +0300
reset: Improve error message when command is missing
If some options were specified without any positional arguments, this
confusing error message was displayed:
$ sanlk-reset -i 42
lockspace_name is required
Now more correct message is displayed:
command is required
Signed-off-by: Nir Soffer <nsoffer(a)redhat.com>
diff --git a/reset/sanlk_reset.c b/reset/sanlk_reset.c
index 7093095..7a15ff9 100644
--- a/reset/sanlk_reset.c
+++ b/reset/sanlk_reset.c
@@ -553,12 +553,18 @@ int main(int argc, char *argv[])
}
}
+ if (optind >= argc) {
+ fprintf(stderr, "command is required\n");
+ exit(2);
+ }
+
+ cmd = argv[optind];
+ optind++;
+
ls_count = 0;
for (i = optind; i < argc; i++) {
- if (i == optind) {
- cmd = argv[i];
- } else if (ls_count == MAX_LS) {
+ if (ls_count == MAX_LS) {
fprintf(stderr, "ignore lockspace_name %s\n", argv[i]);
} else {
ls_names[ls_count] = argv[i];
commit 0ded3083a28178c3e07680581c7047bc7eaf8aba
Author: Nir Soffer <nsoffer(a)redhat.com>
Date: Tue Aug 19 00:10:06 2014 +0300
reset: Add the clear command to the usage
The command was documented in the examples but not in the usage line.
Signed-off-by: Nir Soffer <nsoffer(a)redhat.com>
diff --git a/reset/sanlk_reset.c b/reset/sanlk_reset.c
index 56cada3..7093095 100644
--- a/reset/sanlk_reset.c
+++ b/reset/sanlk_reset.c
@@ -451,7 +451,7 @@ static int update_local_daemon(char *cmd)
static void usage(void)
{
- printf("%s [options] reg|end|reset lockspaces\n", prog_name);
+ printf("%s [options] reg|end|clear|reset lockspaces\n", prog_name);
printf(" --help | -h\n");
printf(" Show this help information.\n");
printf(" --version | -V\n");
9 years, 8 months
[PATCH] reset: Calling with too many lockspaces is a usage error
by Nir Soffer
Previously we complained about ignoring lockspaces, but continue the
operation as usaual, so another program running the sanlk-reset tool
cannot detect the usage error.
Now this will fail with exit code 2 and this message:
too many lockspaces (max 64)
Signed-off-by: Nir Soffer <nsoffer(a)redhat.com>
---
reset/sanlk_reset.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/reset/sanlk_reset.c b/reset/sanlk_reset.c
index 56cada3..6f4978f 100644
--- a/reset/sanlk_reset.c
+++ b/reset/sanlk_reset.c
@@ -559,7 +559,8 @@ int main(int argc, char *argv[])
if (i == optind) {
cmd = argv[i];
} else if (ls_count == MAX_LS) {
- fprintf(stderr, "ignore lockspace_name %s\n", argv[i]);
+ fprintf(stderr, "too many lockspaces (max %d)\n", MAX_LS);
+ exit(2);
} else {
ls_names[ls_count] = argv[i];
ls_count++;
--
1.8.3.1
9 years, 8 months
[PATCH] reset: Normalize exit codes
by Nir Soffer
Previously some usage error were treated as failures, and some failures
caused the program to exit with strange exit codes (e.g. 255). This
patch normalizes the exit code to make sanlk-reset easier to consume by
other programs.
Exit codes:
0 program succeeded
1 program failed
2 program used incorrectly
Signed-off-by: Nir Soffer <nsoffer(a)redhat.com>
---
reset/sanlk_reset.c | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
diff --git a/reset/sanlk_reset.c b/reset/sanlk_reset.c
index 56cada3..fc51c95 100644
--- a/reset/sanlk_reset.c
+++ b/reset/sanlk_reset.c
@@ -38,6 +38,7 @@ static struct sockaddr_un update_addr;
static socklen_t update_addrlen;
#include "sanlk_reset.h"
+#define EXIT_USAGE 2
#define MAX_LS 64
static char *prog_name;
@@ -430,7 +431,7 @@ static int update_local_daemon(char *cmd)
s = setup_resetd_socket();
if (s < 0) {
fprintf(stderr, "Failed to create socket %d\n", s);
- return s;
+ return EXIT_FAILURE;
}
for (i = 0; i < ls_count; i++) {
@@ -440,13 +441,13 @@ static int update_local_daemon(char *cmd)
rv = sendto(s, buf, UPDATE_SIZE, 0, (struct sockaddr *)&update_addr, update_addrlen);
if (rv < 0) {
printf("Failed to update local sanlk-resetd: %s\n", strerror(errno));
- return rv;
+ return EXIT_FAILURE;
} else {
printf("Updated %s %s\n", cmd, ls_names[i]);
}
}
- return 0;
+ return EXIT_SUCCESS;
}
static void usage(void)
@@ -499,7 +500,7 @@ int main(int argc, char *argv[])
if (argc < 2) {
usage();
- exit(EXIT_FAILURE);
+ exit(EXIT_USAGE);
}
static struct option long_options[] = {
@@ -549,7 +550,7 @@ int main(int argc, char *argv[])
case '?':
default:
usage();
- exit(2);
+ exit(EXIT_USAGE);
}
}
@@ -568,7 +569,7 @@ int main(int argc, char *argv[])
if (!ls_count) {
fprintf(stderr, "lockspace_name is required\n");
- exit(2);
+ exit(EXIT_USAGE);
}
/*
@@ -585,12 +586,12 @@ int main(int argc, char *argv[])
if (strcmp(cmd, "reset")) {
fprintf(stderr, "unknown command\n");
- exit(2);
+ exit(EXIT_USAGE);
}
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);
+ exit(EXIT_USAGE);
}
for (i = 0; i < ls_count; i++) {
@@ -605,7 +606,7 @@ int main(int argc, char *argv[])
if (ls_hostids[i] < 1 || ls_hostids[i] > 2000) {
fprintf(stderr, "invalid host_id %d", ls_hostids[i]);
- exit(2);
+ exit(EXIT_USAGE);
}
}
--
1.8.3.1
9 years, 8 months
[PATCH] reset: Calling with too many lockspaces is a usage error
by Nir Soffer
Previously we complained about ignoring lockspaces, but continue the
operation as usaual, so another program running the sanlk-reset tool
cannot detect the usage error.
Now this will fail with exit code 2 and this message:
too many lockspaces (max 64)
Signed-off-by: Nir Soffer <nsoffer(a)redhat.com>
---
reset/sanlk_reset.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/reset/sanlk_reset.c b/reset/sanlk_reset.c
index 56cada3..6f4978f 100644
--- a/reset/sanlk_reset.c
+++ b/reset/sanlk_reset.c
@@ -559,7 +559,8 @@ int main(int argc, char *argv[])
if (i == optind) {
cmd = argv[i];
} else if (ls_count == MAX_LS) {
- fprintf(stderr, "ignore lockspace_name %s\n", argv[i]);
+ fprintf(stderr, "too many lockspaces (max %d)\n", MAX_LS);
+ exit(2);
} else {
ls_names[ls_count] = argv[i];
ls_count++;
--
1.8.3.1
9 years, 8 months
[PATCH] reset: Improve error message when command is missing
by Nir Soffer
If some options were specified without any positional arguments, this
confusing error message was displayed:
$ sanlk-reset -i 42
lockspace_name is required
Now more correct message is displayed:
command is required
Signed-off-by: Nir Soffer <nsoffer(a)redhat.com>
---
reset/sanlk_reset.c | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/reset/sanlk_reset.c b/reset/sanlk_reset.c
index 56cada3..267fe8e 100644
--- a/reset/sanlk_reset.c
+++ b/reset/sanlk_reset.c
@@ -553,12 +553,18 @@ int main(int argc, char *argv[])
}
}
+ if (optind >= argc) {
+ fprintf(stderr, "command is required\n");
+ exit(2);
+ }
+
+ cmd = argv[optind];
+ optind++;
+
ls_count = 0;
for (i = optind; i < argc; i++) {
- if (i == optind) {
- cmd = argv[i];
- } else if (ls_count == MAX_LS) {
+ if (ls_count == MAX_LS) {
fprintf(stderr, "ignore lockspace_name %s\n", argv[i]);
} else {
ls_names[ls_count] = argv[i];
--
1.8.3.1
9 years, 8 months
[PATCH] reset: Add the clear command to the usage
by Nir Soffer
The command was documented in the examples but not in the usage line.
Signed-off-by: Nir Soffer <nsoffer(a)redhat.com>
---
reset/sanlk_reset.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/reset/sanlk_reset.c b/reset/sanlk_reset.c
index 6bff43e..b94e6bd 100644
--- a/reset/sanlk_reset.c
+++ b/reset/sanlk_reset.c
@@ -451,7 +451,7 @@ static int update_local_daemon(char *cmd)
static void usage(void)
{
- printf("%s [options] reg|end|reset lockspaces\n", prog_name);
+ printf("%s [options] reg|end|clear|reset lockspaces\n", prog_name);
printf(" --help | -h\n");
printf(" Show this help information.\n");
printf(" --version | -V\n");
--
1.8.3.1
9 years, 8 months