[Cluster-devel] [GFS2] Various patches
Hi, Following this message will be a variety of patches which constitute my current patch queue. They are aimed at solving a number of issues which have been reported recently relating to performance and memory usage. A number of the patches are standalone, if you ignore the last patch in the series. The final patch is the one which is probably the most interesting. The idea in this one is to improve the performance of the journaling code by being more careful about when log flushes occur. It both reduces the maximum time between flushes on almost idle systems and increases the likelihood of flushes being large (and thus more efficient) when the system is busy. My postmark tests suggest that the patches in combination result in about a 20% improvement on a busy system. I'm intending to post a future patch to allow automatic adjustment of the two new log thresholds which are introduced in this patch series. The current limits of 2/5 and 4/5 of the journal size seem to work well in practise for the default 128M journal size. Note also that the final patch is still in draft form (hence the printk on each journal flush). I'll remove that before final submission, but its useful for anybody testing these to be able to see the state of the journal while running a test. Although the patch set as a whole improves the performance, thats not true of each patch on its own, in particular if you don't apply the final patch, but only the ones leading up to it, you'll see a regression at least on some workloads. As you can probably tell from the description above, this patch set is not yet in its final form, I'm just posting them now in the spirit of releasing early, Steve.
[Cluster-devel] [GFS2] Use atomic_t for journal free blocks counter
From 4b9510f05a676623069d22f49cd9da64ea6f708b Mon Sep 17 00:00:00 2001
From: Steven Whitehouse [EMAIL PROTECTED]
Date: Thu, 8 Nov 2007 14:55:03 +
Subject: [PATCH] [GFS2] Use atomic_t for journal free blocks counter
This patch changes the counter which keeps track of the free
blocks in the journal to an atomic_t in preparation for the
following patch which will update the log reservation code.
Signed-off-by: Steven Whitehouse [EMAIL PROTECTED]
diff --git a/fs/gfs2/incore.h b/fs/gfs2/incore.h
index 911822d..7ae0206 100644
--- a/fs/gfs2/incore.h
+++ b/fs/gfs2/incore.h
@@ -595,7 +595,7 @@ struct gfs2_sbd {
struct list_head sd_log_le_databuf;
struct list_head sd_log_le_ordered;
- unsigned int sd_log_blks_free;
+ atomic_t sd_log_blks_free;
struct mutex sd_log_reserve_mutex;
u64 sd_log_sequence;
diff --git a/fs/gfs2/log.c b/fs/gfs2/log.c
index d246843..9192398 100644
--- a/fs/gfs2/log.c
+++ b/fs/gfs2/log.c
@@ -301,7 +301,7 @@ int gfs2_log_reserve(struct gfs2_sbd *sdp, unsigned int
blks)
mutex_lock(sdp-sd_log_reserve_mutex);
gfs2_log_lock(sdp);
- while(sdp-sd_log_blks_free = (blks + reserved_blks)) {
+ while(atomic_read(sdp-sd_log_blks_free) = (blks + reserved_blks)) {
gfs2_log_unlock(sdp);
gfs2_ail1_empty(sdp, 0);
gfs2_log_flush(sdp, NULL);
@@ -310,7 +310,7 @@ int gfs2_log_reserve(struct gfs2_sbd *sdp, unsigned int
blks)
gfs2_ail1_start(sdp, 0);
gfs2_log_lock(sdp);
}
- sdp-sd_log_blks_free -= blks;
+ atomic_sub(blks, sdp-sd_log_blks_free);
gfs2_log_unlock(sdp);
mutex_unlock(sdp-sd_log_reserve_mutex);
@@ -330,9 +330,9 @@ void gfs2_log_release(struct gfs2_sbd *sdp, unsigned int
blks)
{
gfs2_log_lock(sdp);
- sdp-sd_log_blks_free += blks;
+ atomic_add(blks, sdp-sd_log_blks_free);
gfs2_assert_withdraw(sdp,
-sdp-sd_log_blks_free = sdp-sd_jdesc-jd_blocks);
+atomic_read(sdp-sd_log_blks_free) =
sdp-sd_jdesc-jd_blocks);
gfs2_log_unlock(sdp);
up_read(sdp-sd_log_flush_lock);
}
@@ -559,8 +559,8 @@ static void log_pull_tail(struct gfs2_sbd *sdp, unsigned
int new_tail)
ail2_empty(sdp, new_tail);
gfs2_log_lock(sdp);
- sdp-sd_log_blks_free += dist;
- gfs2_assert_withdraw(sdp, sdp-sd_log_blks_free =
sdp-sd_jdesc-jd_blocks);
+ atomic_add(dist, sdp-sd_log_blks_free);
+ gfs2_assert_withdraw(sdp, atomic_read(sdp-sd_log_blks_free) =
sdp-sd_jdesc-jd_blocks);
gfs2_log_unlock(sdp);
sdp-sd_log_tail = new_tail;
@@ -733,7 +733,7 @@ void __gfs2_log_flush(struct gfs2_sbd *sdp, struct
gfs2_glock *gl)
log_flush_commit(sdp);
else if (sdp-sd_log_tail != current_tail(sdp) !sdp-sd_log_idle){
gfs2_log_lock(sdp);
- sdp-sd_log_blks_free--; /* Adjust for unreserved buffer */
+ atomic_dec(sdp-sd_log_blks_free); /* Adjust for unreserved
buffer */
gfs2_log_unlock(sdp);
log_write_header(sdp, 0, PULL);
}
@@ -773,12 +773,12 @@ static void log_refund(struct gfs2_sbd *sdp, struct
gfs2_trans *tr)
sdp-sd_log_commited_revoke += tr-tr_num_revoke - tr-tr_num_revoke_rm;
gfs2_assert_withdraw(sdp, ((int)sdp-sd_log_commited_revoke) = 0);
reserved = calc_reserved(sdp);
- old = sdp-sd_log_blks_free;
- sdp-sd_log_blks_free += tr-tr_reserved -
-(reserved - sdp-sd_log_blks_reserved);
+ old = atomic_read(sdp-sd_log_blks_free);
+ atomic_add(tr-tr_reserved - (reserved - sdp-sd_log_blks_reserved),
+ sdp-sd_log_blks_free);
- gfs2_assert_withdraw(sdp, sdp-sd_log_blks_free = old);
- gfs2_assert_withdraw(sdp, sdp-sd_log_blks_free =
+ gfs2_assert_withdraw(sdp, atomic_read(sdp-sd_log_blks_free) = old);
+ gfs2_assert_withdraw(sdp, atomic_read(sdp-sd_log_blks_free) =
sdp-sd_jdesc-jd_blocks);
sdp-sd_log_blks_reserved = reserved;
@@ -831,7 +831,7 @@ void gfs2_log_shutdown(struct gfs2_sbd *sdp)
log_write_header(sdp, GFS2_LOG_HEAD_UNMOUNT,
(sdp-sd_log_tail == current_tail(sdp)) ? 0 : PULL);
- gfs2_assert_warn(sdp, sdp-sd_log_blks_free ==
sdp-sd_jdesc-jd_blocks);
+ gfs2_assert_warn(sdp, atomic_read(sdp-sd_log_blks_free) ==
sdp-sd_jdesc-jd_blocks);
gfs2_assert_warn(sdp, sdp-sd_log_head == sdp-sd_log_tail);
gfs2_assert_warn(sdp, list_empty(sdp-sd_ail2_list));
diff --git a/fs/gfs2/ops_fstype.c b/fs/gfs2/ops_fstype.c
index 52aaba9..1bba6ac 100644
--- a/fs/gfs2/ops_fstype.c
+++ b/fs/gfs2/ops_fstype.c
@@ -339,7 +339,7 @@ static int init_journal(struct gfs2_sbd *sdp, int undo)
if (sdp-sd_args.ar_spectator) {
sdp-sd_jdesc = gfs2_jdesc_find(sdp, 0);
-
[Cluster-devel] [GFS2] Move gfs2_logd into log.c
From fbf7c723b65e7eccf462b80bb378bbe5ea8037b0 Mon Sep 17 00:00:00 2001
From: Steven Whitehouse [EMAIL PROTECTED]
Date: Fri, 9 Nov 2007 10:01:41 +
Subject: [PATCH] [GFS2] Move gfs2_logd into log.c
This means that we can mark gfs2_ail1_empty static and prepares
the way for further changes.
Signed-off-by: Steven Whitehouse [EMAIL PROTECTED]
diff --git a/fs/gfs2/daemon.c b/fs/gfs2/daemon.c
index 3731ab0..e519919 100644
--- a/fs/gfs2/daemon.c
+++ b/fs/gfs2/daemon.c
@@ -83,56 +83,6 @@ int gfs2_recoverd(void *data)
}
/**
- * gfs2_logd - Update log tail as Active Items get flushed to in-place blocks
- * @sdp: Pointer to GFS2 superblock
- *
- * Also, periodically check to make sure that we're using the most recent
- * journal index.
- */
-
-int gfs2_logd(void *data)
-{
- struct gfs2_sbd *sdp = data;
- struct gfs2_holder ji_gh;
- unsigned long t;
- int need_flush;
-
- while (!kthread_should_stop()) {
- /* Advance the log tail */
-
- t = sdp-sd_log_flush_time +
- gfs2_tune_get(sdp, gt_log_flush_secs) * HZ;
-
- gfs2_ail1_empty(sdp, DIO_ALL);
- gfs2_log_lock(sdp);
- need_flush = sdp-sd_log_num_buf gfs2_tune_get(sdp,
gt_incore_log_blocks);
- gfs2_log_unlock(sdp);
- if (need_flush || time_after_eq(jiffies, t)) {
- gfs2_log_flush(sdp, NULL);
- sdp-sd_log_flush_time = jiffies;
- }
-
- /* Check for latest journal index */
-
- t = sdp-sd_jindex_refresh_time +
- gfs2_tune_get(sdp, gt_jindex_refresh_secs) * HZ;
-
- if (time_after_eq(jiffies, t)) {
- if (!gfs2_jindex_hold(sdp, ji_gh))
- gfs2_glock_dq_uninit(ji_gh);
- sdp-sd_jindex_refresh_time = jiffies;
- }
-
- t = gfs2_tune_get(sdp, gt_logd_secs) * HZ;
- if (freezing(current))
- refrigerator();
- schedule_timeout_interruptible(t);
- }
-
- return 0;
-}
-
-/**
* gfs2_quotad - Write cached quota changes into the quota file
* @sdp: Pointer to GFS2 superblock
*
diff --git a/fs/gfs2/daemon.h b/fs/gfs2/daemon.h
index 0de9b35..4be084f 100644
--- a/fs/gfs2/daemon.h
+++ b/fs/gfs2/daemon.h
@@ -12,7 +12,6 @@
int gfs2_glockd(void *data);
int gfs2_recoverd(void *data);
-int gfs2_logd(void *data);
int gfs2_quotad(void *data);
#endif /* __DAEMON_DOT_H__ */
diff --git a/fs/gfs2/log.c b/fs/gfs2/log.c
index 9192398..e88a684 100644
--- a/fs/gfs2/log.c
+++ b/fs/gfs2/log.c
@@ -16,6 +16,8 @@
#include linux/crc32.h
#include linux/lm_interface.h
#include linux/delay.h
+#include linux/kthread.h
+#include linux/freezer.h
#include gfs2.h
#include incore.h
@@ -26,6 +28,7 @@
#include meta_io.h
#include util.h
#include dir.h
+#include super.h
#define PULL 1
@@ -208,7 +211,7 @@ static void gfs2_ail1_start(struct gfs2_sbd *sdp, int flags)
gfs2_log_unlock(sdp);
}
-int gfs2_ail1_empty(struct gfs2_sbd *sdp, int flags)
+static int gfs2_ail1_empty(struct gfs2_sbd *sdp, int flags)
{
struct gfs2_ail *ai, *s;
int ret;
@@ -859,3 +862,54 @@ void gfs2_meta_syncfs(struct gfs2_sbd *sdp)
}
}
+
+/**
+ * gfs2_logd - Update log tail as Active Items get flushed to in-place blocks
+ * @sdp: Pointer to GFS2 superblock
+ *
+ * Also, periodically check to make sure that we're using the most recent
+ * journal index.
+ */
+
+int gfs2_logd(void *data)
+{
+ struct gfs2_sbd *sdp = data;
+ struct gfs2_holder ji_gh;
+ unsigned long t;
+ int need_flush;
+
+ while (!kthread_should_stop()) {
+ /* Advance the log tail */
+
+ t = sdp-sd_log_flush_time +
+ gfs2_tune_get(sdp, gt_log_flush_secs) * HZ;
+
+ gfs2_ail1_empty(sdp, DIO_ALL);
+ gfs2_log_lock(sdp);
+ need_flush = sdp-sd_log_num_buf gfs2_tune_get(sdp,
gt_incore_log_blocks);
+ gfs2_log_unlock(sdp);
+ if (need_flush || time_after_eq(jiffies, t)) {
+ gfs2_log_flush(sdp, NULL);
+ sdp-sd_log_flush_time = jiffies;
+ }
+
+ /* Check for latest journal index */
+
+ t = sdp-sd_jindex_refresh_time +
+ gfs2_tune_get(sdp, gt_jindex_refresh_secs) * HZ;
+
+ if (time_after_eq(jiffies, t)) {
+ if (!gfs2_jindex_hold(sdp, ji_gh))
+ gfs2_glock_dq_uninit(ji_gh);
+ sdp-sd_jindex_refresh_time = jiffies;
+ }
+
+ t = gfs2_tune_get(sdp, gt_logd_secs) * HZ;
+ if (freezing(current))
+ refrigerator();
+ schedule_timeout_interruptible(t);
+ }
+
+ return 0;
+}
+
diff --git a/fs/gfs2/log.h
[Cluster-devel] [GFS2] Don't periodically update the jindex
From b5dc3ccdb88e58656aadac428452d2c3050802bc Mon Sep 17 00:00:00 2001
From: Steven Whitehouse [EMAIL PROTECTED]
Date: Fri, 9 Nov 2007 10:07:21 +
Subject: [PATCH] [GFS2] Don't periodically update the jindex
We only care about the content of the jindex in two cases,
one is when we mount the fs and the other is when we need
to recover another journal. In both cases we have to update
the jindex anyway, so there is no point in updating it
periodically between times, so this removes it to simplify
gfs2_logd.
Signed-off-by: Steven Whitehouse [EMAIL PROTECTED]
diff --git a/fs/gfs2/incore.h b/fs/gfs2/incore.h
index 7ae0206..330f4c7 100644
--- a/fs/gfs2/incore.h
+++ b/fs/gfs2/incore.h
@@ -411,7 +411,6 @@ struct gfs2_tune {
unsigned int gt_demote_secs; /* Cache retention for unheld glock */
unsigned int gt_incore_log_blocks;
unsigned int gt_log_flush_secs;
- unsigned int gt_jindex_refresh_secs; /* Check for new journal index */
unsigned int gt_recoverd_secs;
unsigned int gt_logd_secs;
diff --git a/fs/gfs2/log.c b/fs/gfs2/log.c
index e88a684..4dcc7a8 100644
--- a/fs/gfs2/log.c
+++ b/fs/gfs2/log.c
@@ -28,7 +28,6 @@
#include meta_io.h
#include util.h
#include dir.h
-#include super.h
#define PULL 1
@@ -874,7 +873,6 @@ void gfs2_meta_syncfs(struct gfs2_sbd *sdp)
int gfs2_logd(void *data)
{
struct gfs2_sbd *sdp = data;
- struct gfs2_holder ji_gh;
unsigned long t;
int need_flush;
@@ -893,17 +891,6 @@ int gfs2_logd(void *data)
sdp-sd_log_flush_time = jiffies;
}
- /* Check for latest journal index */
-
- t = sdp-sd_jindex_refresh_time +
- gfs2_tune_get(sdp, gt_jindex_refresh_secs) * HZ;
-
- if (time_after_eq(jiffies, t)) {
- if (!gfs2_jindex_hold(sdp, ji_gh))
- gfs2_glock_dq_uninit(ji_gh);
- sdp-sd_jindex_refresh_time = jiffies;
- }
-
t = gfs2_tune_get(sdp, gt_logd_secs) * HZ;
if (freezing(current))
refrigerator();
diff --git a/fs/gfs2/super.c b/fs/gfs2/super.c
index 548cc8b..2e74792 100644
--- a/fs/gfs2/super.c
+++ b/fs/gfs2/super.c
@@ -54,7 +54,6 @@ void gfs2_tune_init(struct gfs2_tune *gt)
gt-gt_demote_secs = 300;
gt-gt_incore_log_blocks = 1024;
gt-gt_log_flush_secs = 60;
- gt-gt_jindex_refresh_secs = 60;
gt-gt_recoverd_secs = 60;
gt-gt_logd_secs = 1;
gt-gt_quotad_secs = 5;
diff --git a/fs/gfs2/sys.c b/fs/gfs2/sys.c
index 65dd065..7f828a2 100644
--- a/fs/gfs2/sys.c
+++ b/fs/gfs2/sys.c
@@ -428,7 +428,6 @@ TUNE_ATTR_2(name, name##_store)
TUNE_ATTR(demote_secs, 0);
TUNE_ATTR(incore_log_blocks, 0);
TUNE_ATTR(log_flush_secs, 0);
-TUNE_ATTR(jindex_refresh_secs, 0);
TUNE_ATTR(quota_warn_period, 0);
TUNE_ATTR(quota_quantum, 0);
TUNE_ATTR(atime_quantum, 0);
@@ -450,7 +449,6 @@ static struct attribute *tune_attrs[] = {
tune_attr_demote_secs.attr,
tune_attr_incore_log_blocks.attr,
tune_attr_log_flush_secs.attr,
- tune_attr_jindex_refresh_secs.attr,
tune_attr_quota_warn_period.attr,
tune_attr_quota_quantum.attr,
tune_attr_atime_quantum.attr,
--
1.5.1.2
[Cluster-devel] [GFS2] Update journal wake up/flushing
This patch has several important features:
o Log flushing removed from gfs2_log_reserve so that this just waits
in the case that we try to start a transaction when there are not
enough free blocks in the journal. We use an exclusive wait queue to
avoid the thundering herd and to ensure we don't have starvation of
any particular thread.
o The wake up of gfs2_logd is changed so that we now wake up:
- At the end of a transaction if one of the two thresholds is exceeded
- At the start of a transaction if we've had to wait for log space
- Every 30 secs (adjustable via sysfs) if there has been no other log
flush in the mean time. Note that previously we flushed every 60 secs
and we did that even if there had been another log flush.
o I've altered the thresholds from the 1/3 and 2/3 in the previous patch to
2/5 and 4/5 of the journal size since that gives slightly better performance
on my machine, but bear in mind that these will hopefully be adjusted
automatically
at some point in the future.
The debugging printk in gfs2_logd has been left in this patch, but will be
removed before its added to the git tree.
diff --git a/fs/gfs2/incore.h b/fs/gfs2/incore.h
index d2b52d7..743ebba 100644
--- a/fs/gfs2/incore.h
+++ b/fs/gfs2/incore.h
@@ -409,7 +409,6 @@ struct gfs2_tune {
spinlock_t gt_spin;
unsigned int gt_demote_secs; /* Cache retention for unheld glock */
- unsigned int gt_log_flush_secs;
unsigned int gt_recoverd_secs;
unsigned int gt_logd_secs;
@@ -541,7 +540,6 @@ struct gfs2_sbd {
spinlock_t sd_jindex_spin;
struct mutex sd_jindex_mutex;
unsigned int sd_journals;
- unsigned long sd_jindex_refresh_time;
struct gfs2_jdesc *sd_jdesc;
struct gfs2_holder sd_journal_gh;
@@ -597,14 +595,14 @@ struct gfs2_sbd {
atomic_t sd_log_thresh1;
atomic_t sd_log_thresh2;
atomic_t sd_log_blks_free;
- struct mutex sd_log_reserve_mutex;
+ wait_queue_head_t sd_log_waitq;
+ wait_queue_head_t sd_logd_waitq;
u64 sd_log_sequence;
unsigned int sd_log_head;
unsigned int sd_log_tail;
int sd_log_idle;
- unsigned long sd_log_flush_time;
struct rw_semaphore sd_log_flush_lock;
atomic_t sd_log_in_flight;
wait_queue_head_t sd_log_flush_wait;
diff --git a/fs/gfs2/log.c b/fs/gfs2/log.c
index 7b2417c..299ad48 100644
--- a/fs/gfs2/log.c
+++ b/fs/gfs2/log.c
@@ -167,7 +167,7 @@ static int gfs2_ail1_empty_one(struct gfs2_sbd *sdp, struct
gfs2_ail *ai, int fl
return list_empty(ai-ai_ail1_list);
}
-static void gfs2_ail1_start(struct gfs2_sbd *sdp, int flags)
+static void gfs2_ail1_start(struct gfs2_sbd *sdp)
{
struct list_head *head;
u64 sync_gen;
@@ -188,14 +188,7 @@ static void gfs2_ail1_start(struct gfs2_sbd *sdp, int
flags)
first_ai-ai_sync_gen = sync_gen;
gfs2_ail1_start_one(sdp, first_ai); /* This may drop log lock */
- if (flags DIO_ALL)
- first = NULL;
-
while(!done) {
- if (first (head-prev != first ||
- gfs2_ail1_empty_one(sdp, first_ai, 0)))
- break;
-
done = 1;
list_for_each_entry_safe_reverse(ai, tmp, head, ai_list) {
if (ai-ai_sync_gen = sync_gen)
@@ -289,54 +282,56 @@ static void ail2_empty(struct gfs2_sbd *sdp, unsigned int
new_tail)
* flush time, so we ensure that we have just enough free blocks at all
* times to avoid running out during a log flush.
*
+ * We no longer flush the log here, instead we wake up logd to do that
+ * for us. To avoid the thundering herd and to ensure that we deal fairly
+ * with queued waiters, we use an exclusive wait. This means that when we
+ * get woken with enough journal space to get our reservation, we need to
+ * wake the next waiter on the list.
+ *
* Returns: errno
*/
int gfs2_log_reserve(struct gfs2_sbd *sdp, unsigned int blks)
{
- unsigned int try = 0;
unsigned reserved_blks = 6 * (4096 / sdp-sd_vfs-s_blocksize);
+ unsigned wanted = blks + reserved_blks;
+ DEFINE_WAIT(wait);
+ int did_wait = 0;
+ unsigned int free_blocks;
if (gfs2_assert_warn(sdp, blks) ||
gfs2_assert_warn(sdp, blks = sdp-sd_jdesc-jd_blocks))
return -EINVAL;
-
- mutex_lock(sdp-sd_log_reserve_mutex);
- gfs2_log_lock(sdp);
- while(atomic_read(sdp-sd_log_blks_free) = (blks + reserved_blks)) {
- gfs2_log_unlock(sdp);
- gfs2_ail1_empty(sdp, 0);
- gfs2_log_flush(sdp, NULL);
-
- if (try++)
- gfs2_ail1_start(sdp, 0);
- gfs2_log_lock(sdp);
+retry:
+ free_blocks = atomic_read(sdp-sd_log_blks_free);
+ if (unlikely(free_blocks = wanted)) {
+ wake_up(sdp-sd_logd_waitq);
+ do
[Cluster-devel] cluster/gfs2 edit/hexedit.h fsck/initialize.c ...
CVSROOT:/cvs/cluster
Module name:cluster
Branch: RHEL5
Changes by: [EMAIL PROTECTED] 2007-11-13 17:06:33
Modified files:
gfs2/edit : hexedit.h
gfs2/fsck : initialize.c util.h
gfs2/libgfs2 : buf.c libgfs2.h misc.c
gfs2/mkfs : gfs2_mkfs.h
gfs2/quota : check.c gfs2_quota.h main.c
gfs2/tool : Makefile gfs2_tool.h main.c sb.c
Removed files:
gfs2/tool : util.c
Log message:
Resolves: bz 364741: GFS2: gfs2_quota doesn't work unless lock
table specified
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/edit/hexedit.h.diff?cvsroot=clusteronly_with_tag=RHEL5r1=1.4.2.4r2=1.4.2.5
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/fsck/initialize.c.diff?cvsroot=clusteronly_with_tag=RHEL5r1=1.6.2.4r2=1.6.2.5
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/fsck/util.h.diff?cvsroot=clusteronly_with_tag=RHEL5r1=1.2r2=1.2.2.1
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/libgfs2/buf.c.diff?cvsroot=clusteronly_with_tag=RHEL5r1=1.3r2=1.3.2.1
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/libgfs2/libgfs2.h.diff?cvsroot=clusteronly_with_tag=RHEL5r1=1.7.2.14r2=1.7.2.15
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/libgfs2/misc.c.diff?cvsroot=clusteronly_with_tag=RHEL5r1=1.2.2.3r2=1.2.2.4
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/mkfs/gfs2_mkfs.h.diff?cvsroot=clusteronly_with_tag=RHEL5r1=1.9r2=1.9.2.1
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/quota/check.c.diff?cvsroot=clusteronly_with_tag=RHEL5r1=1.2.2.4r2=1.2.2.5
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/quota/gfs2_quota.h.diff?cvsroot=clusteronly_with_tag=RHEL5r1=1.1.2.4r2=1.1.2.5
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/quota/main.c.diff?cvsroot=clusteronly_with_tag=RHEL5r1=1.2.2.6r2=1.2.2.7
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/tool/Makefile.diff?cvsroot=clusteronly_with_tag=RHEL5r1=1.5.2.1r2=1.5.2.2
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/tool/gfs2_tool.h.diff?cvsroot=clusteronly_with_tag=RHEL5r1=1.5.2.4r2=1.5.2.5
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/tool/main.c.diff?cvsroot=clusteronly_with_tag=RHEL5r1=1.4.2.2r2=1.4.2.3
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/tool/sb.c.diff?cvsroot=clusteronly_with_tag=RHEL5r1=1.2.2.1r2=1.2.2.2
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/tool/util.c.diff?cvsroot=clusteronly_with_tag=RHEL5r1=1.5.2.3r2=NONE
--- cluster/gfs2/edit/hexedit.h 2007/10/11 20:32:35 1.4.2.4
+++ cluster/gfs2/edit/hexedit.h 2007/11/13 17:06:32 1.4.2.5
@@ -178,31 +178,6 @@
#define SCREEN_HEIGHT (16)
#define SCREEN_WIDTH(16)
-/* I/O macros */
-
-#define do_lseek(fd, off) \
-{ \
- if (lseek((fd), (off), SEEK_SET) != (off)) \
-die(bad seek: %s on line %d of file %s\n, \
- strerror(errno),__LINE__, __FILE__); \
-}
-
-#define do_read(fd, buff, len) \
-{ \
- if (read((fd), (buff), (len)) != (len)) \
-die(bad read: %s on line %d of file %s\n, \
- strerror(errno), __LINE__, __FILE__); \
-}
-
-#define do_write(fd, buff, len) \
-{ \
- if (write((fd), (buff), (len)) != (len)) \
-die(bad write: %s on line %d of file %s\n, \
- strerror(errno), __LINE__, __FILE__); \
-}
-
-
-
/* Memory macros */
#define type_zalloc(ptr, type, count) \
--- cluster/gfs2/fsck/initialize.c 2007/10/19 15:07:58 1.6.2.4
+++ cluster/gfs2/fsck/initialize.c 2007/11/13 17:06:32 1.6.2.5
@@ -169,7 +169,7 @@
last_data_block = rmax;
first_data_block = rmin;
- if(do_lseek(sdp-device_fd, (last_fs_block * sdp-sd_sb.sb_bsize))){
+ if(fsck_lseek(sdp-device_fd, (last_fs_block * sdp-sd_sb.sb_bsize))){
log_crit(Can't seek to last block in file system: %
PRIu64 (0x% PRIx64 )\n, last_fs_block,
last_fs_block);
goto fail;
--- cluster/gfs2/fsck/util.h2006/06/06 14:49:31 1.2
+++ cluster/gfs2/fsck/util.h2007/11/13 17:06:32 1.2.2.1
@@ -16,16 +16,9 @@
#include libgfs2.h
-#define do_lseek(fd, off) \
+#define fsck_lseek(fd, off) \
((lseek((fd), (off), SEEK_SET) == (off)) ? 0 : -1)
-#define do_read(fd, buff, len) \
- ((read((fd), (buff), (len)) == (len)) ? 0 : -1)
-
-#define do_write(fd, buff, len) \
- ((write((fd), (buff), (len)) == (len)) ? 0 : -1)
-
-
int compute_height(struct gfs2_sbd *sdp, uint64_t sz);
struct di_info *search_list(osi_list_t *list, uint64_t addr);
void warm_fuzzy_stuff(uint64_t block);
--- cluster/gfs2/libgfs2/buf.c 2006/06/08 21:02:15 1.3
+++ cluster/gfs2/libgfs2/buf.c 2007/11/13 17:06:32 1.3.2.1
@@ -25,27 +25,6 @@
#include libgfs2.h
-#define do_lseek(sdp, off) \
-do { \
- if (lseek((sdp)-device_fd, (off), SEEK_SET) != (off)) \
- die(bad seek: %s on line %d of file %s\n, \
- strerror(errno), __LINE__, __FILE__); \
-} while (0)
-
-#define do_read(sdp, buf,
[Cluster-devel] cluster/rgmanager/src/resources service.sh
CVSROOT:/cvs/cluster Module name:cluster Branch: RHEL5 Changes by: [EMAIL PROTECTED] 2007-11-13 17:38:44 Modified files: rgmanager/src/resources: service.sh Log message: Ensure service.sh has explicit default values Patches: http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/resources/service.sh.diff?cvsroot=clusteronly_with_tag=RHEL5r1=1.7.2.5r2=1.7.2.6 --- cluster/rgmanager/src/resources/service.sh 2007/07/31 17:54:55 1.7.2.5 +++ cluster/rgmanager/src/resources/service.sh 2007/11/13 17:38:43 1.7.2.6 @@ -77,7 +77,7 @@ shortdesc lang=en Automatic start after quorum formation /shortdesc -content type=boolean/ +content type=boolean default=1/ /parameter parameter name=hardrecovery reconfig=1 @@ -92,7 +92,7 @@ shortdesc lang=en Reboot if stop phase fails /shortdesc -content type=boolean/ +content type=boolean default=0/ /parameter parameter name=exclusive @@ -109,7 +109,7 @@ shortdesc lang=en Exclusive resource group /shortdesc -content type=boolean/ +content type=boolean default=0/ /parameter parameter name=nfslock @@ -125,7 +125,7 @@ shortdesc lang=en Enable NFS lock workarounds /shortdesc - content type=boolean/ + content type=boolean default=0/ /parameter parameter name=recovery reconfig=1 @@ -141,7 +141,7 @@ shortdesc lang=en Failure recovery policy /shortdesc -content type=string/ +content type=string default=restart/ /parameter parameter name=depend
