[Cluster-devel] cluster/group/gfs_controld plock.c
teigland at sourceware.org
teigland at sourceware.org
Wed Aug 16 19:30:38 UTC 2006
CVSROOT: /cvs/cluster
Module name: cluster
Changes by: teigland at sourceware.org 2006-08-16 19:30:37
Modified files:
group/gfs_controld: plock.c
Log message:
after unlinking a ckpt, don't try to close it if we don't have it open,
(no big problem, the close would just fail) and go back to syslogging
ckpt close errors
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/group/gfs_controld/plock.c.diff?cvsroot=cluster&r1=1.15&r2=1.16
--- cluster/group/gfs_controld/plock.c 2006/08/16 17:05:24 1.15
+++ cluster/group/gfs_controld/plock.c 2006/08/16 19:30:36 1.16
@@ -1081,6 +1081,9 @@
s.numberOfSections, s.memoryUsed);
out_close:
+ if (!h)
+ goto out;
+
rv = saCkptCheckpointClose(h);
if (rv == SA_AIS_ERR_TRY_AGAIN) {
log_group(mg, "unlink ckpt close retry");
@@ -1088,11 +1091,12 @@
goto out_close;
}
if (rv != SA_AIS_OK) {
- /* should this be log_error */
- log_group(mg, "unlink ckpt close error %d", rv);
- ret = -1;
+ log_error("unlink ckpt %llx close err %d %s", h, rv, mg->name);
+ /* should we return an error here and possibly cause
+ store_plocks() to fail on this? */
+ /* ret = -1; */
}
-
+ out:
mg->cp_handle = 0;
return ret;
}
More information about the Cluster-devel
mailing list