Re: [libvirt] [PATCH 2/2] sanlock: don't fail with unregistered domains

On 05/12/2014 09:37 AM, Martin Kletzander wrote: > When a domain was started without registration in sanlock, but libvirt > was restarted after that, most of the operations failed due to > contacting sanlock about that process. E.g. migration could not be > performed because the locks couldn't be released (or inquired before a > release). > > Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1088034 > > Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com&gt; > --- > src/locking/lock_driver_sanlock.c | 31 +++++++++++++++++++++++++++++++ > 1 file changed, 31 insertions(+) > > diff --git a/src/locking/lock_driver_sanlock.c b/src/locking/lock_driver_sanlock.c > index 01441a0..5bc72ba 100644

> @@ -915,6 +929,9 @@ static int virLockManagerSanlockAcquire(virLockManagerPtr lock, > goto error; > } > > + /* Mark the pid as registered */ > + priv->registered = true; > + > if (action != VIR_DOMAIN_LOCK_FAILURE_DEFAULT) { > char uuidstr[VIR_UUID_STRING_BUFLEN]; > virUUIDFormat(priv->vm_uuid, uuidstr); > @@ -922,6 +939,9 @@ static int virLockManagerSanlockAcquire(virLockManagerPtr lock, > uuidstr, action) < 0) > goto error; > } > + } else if (!priv->registered) { > + VIR_DEBUG("Process not registered, not acquiring lock"); > + return 0; Coverity found an issue regarding 'opt' not being VIR_FREE()'d