Skip to contentSkip to conversation

ocfs2: lighten up allocate transaction

PATCH New Younger Liu 2 participants 4 messages Jul 4, 2013 – Jul 5, 2013 OCFS2

lore
Share & tools
lore

Younger Liu

author
#0 lore raw

PATCH 1/1 ocfs2: lighten up allocate transaction

The issue scenario is as following:
When fallocating a very large disk space for a small file, __ocfs2_extend_allocation attempts to get a very large transaction. For some journal sizes, there may be not enough room for this transaction, and the fallocate will fail.

The patch below extents & restarts the transaction as necessary while allocating space, and should work with even the smallest journal. This patch refers ext4 resize.

Test:

# mkfs.ocfs2 -b 4K -C 32K -T datafiles /dev/sdc
...(jounral size is 32M)
# mount.ocfs2 /dev/sdc /mnt/ocfs2/
# touch /mnt/ocfs2/1.log
# fallocate -o 0 -l 400G /mnt/ocfs2/1.log
fallocate: /mnt/ocfs2/1.log: fallocate failed: Cannot allocate memory
# tail -f /var/log/messages
Jul  3 19:42:08 linux-KooNDD kernel: [ 7372.278591] JBD: fallocate wants too many credits (2051 > 2048)
Jul  3 19:42:08 linux-KooNDD kernel: [ 7372.278597] (fallocate,6438,0):__ocfs2_extend_allocation:709 ERROR: status = -12
Jul  3 19:42:08 linux-KooNDD kernel: [ 7372.278603] (fallocate,6438,0):ocfs2_allocate_unwritten_extents:1504 ERROR: status = -12
Jul  3 19:42:08 linux-KooNDD kernel: [ 7372.278607] (fallocate,6438,0):__ocfs2_change_file_space:1955 ERROR: status = -12
^C

With this patch, the test works well.

Signed-off-by Younger Liu <[email protected]>
---
 fs/ocfs2/file.c    |    6 +-----
 fs/ocfs2/journal.c |   34 ++++++++++++++++++++++++++++++++++
 fs/ocfs2/journal.h |   11 +++++++++++
 3 files changed, 46 insertions(+), 5 deletions(-)
fs/ocfs2/file.c +1 -5
index 05c0bb1..4943918 100644
@@ -666,11 +666,7 @@ restarted_transaction:
 		} else {
 			BUG_ON(why != RESTART_TRANS);
 
-			/* TODO: This can be more intelligent. */
-			credits = ocfs2_calc_extend_credits(osb->sb,
-							    &fe->id2.i_list,
-							    clusters_to_add);
-			status = ocfs2_extend_trans(handle, credits);
+			status = ocfs2_allocate_extend_trans(handle, 1);
 			if (status < 0) {
 				/* handle still has to be committed at
 				 * this point. */
fs/ocfs2/journal.c +34 -0
index 8eccfab..501b2fe 100644
@@ -455,6 +455,40 @@ bail:
 	return status;
 }
 
+/*
+ * If we have fewer than thresh credits, extend by OCFS2_MAX_TRANS_DATA.
+ * If that fails, restart the transaction & regain write access for the
+ * buffer head which is used for metadata modifications.
+ * Refer extend_or_restart_transaction() 
+ */
+int ocfs2_allocate_extend_trans(handle_t *handle, int thresh)
+{
+	int status;
+
+	BUG_ON(!handle);
+	
+	if (handle->h_buffer_credits < thresh)
+		return 0;
+
+	status = jbd2_journal_extend(handle, OCFS2_MAX_TRANS_DATA);
+	if (status < 0) {
+		mlog_errno(status);
+		goto bail;
+	}
+
+	if (status > 0) {
+		status = jbd2_journal_restart(handle, OCFS2_MAX_TRANS_DATA);
+		if (status < 0) {
+			mlog_errno(status);
+			goto bail;
+		}
+	}
+	
+bail:
+	return status;
+}
+
+
 struct ocfs2_triggers {
 	struct jbd2_buffer_trigger_type	ot_triggers;
 	int				ot_offset;
fs/ocfs2/journal.h +11 -0
index a3385b6..62a26bd 100644
@@ -259,6 +259,17 @@ handle_t		    *ocfs2_start_trans(struct ocfs2_super *osb,
 int			     ocfs2_commit_trans(struct ocfs2_super *osb,
 						handle_t *handle);
 int			     ocfs2_extend_trans(handle_t *handle, int nblocks);
+int			     ocfs2_allocate_extend_trans(handle_t *handle,
+						int thresh);
+
+/* 
+ * Define an arbitrary limit for the amount of data we will anticipate
+ * writing to any given transaction.  For unbounded transactions such as
+ * fallocate(2) we can write more than this, but we always
+ * start off@the maximum transaction size and grow the transaction
+ * optimistically as we go.
+ */
+#define OCFS2_MAX_TRANS_DATA	64U
 
 /*
  * Create access is for when we get a newly created buffer and we're
Signature · 1 line
1.7.9.7
#1 lore raw

PATCH 1/1 ocfs2: lighten up allocate transaction

Hi Yonger,

Quoted 11 lines · Younger Liu

The issue scenario is as following:
When fallocating a very large disk space for a small file, __ocfs2_extend_allocation attempts to get a very large transaction. For some journal sizes, there may be not enough room for this transaction, and the fallocate will fail.

The patch below extents & restarts the transaction as necessary while allocating space, and should work with even the smallest journal. This patch refers ext4 resize.

Test:

Quoted 11 lines
# mkfs.ocfs2 -b 4K -C 32K -T datafiles /dev/sdc
...(jounral size is 32M)
# mount.ocfs2 /dev/sdc /mnt/ocfs2/
# touch /mnt/ocfs2/1.log
# fallocate -o 0 -l 400G /mnt/ocfs2/1.log
fallocate: /mnt/ocfs2/1.log: fallocate failed: Cannot allocate memory
# tail -f /var/log/messages
Jul  3 19:42:08 linux-KooNDD kernel: [ 7372.278591] JBD: fallocate wants too many credits (2051 > 2048)
Jul  3 19:42:08 linux-KooNDD kernel: [ 7372.278597] (fallocate,6438,0):__ocfs2_extend_allocation:709 ERROR: status = -12
Jul  3 19:42:08 linux-KooNDD kernel: [ 7372.278603] (fallocate,6438,0):ocfs2_allocate_unwritten_extents:1504 ERROR: status = -12
Jul  3 19:42:08 linux-KooNDD kernel: [ 7372.278607] (fallocate,6438,0):__ocfs2_change_file_space:1955 ERROR: status = -12

Could you please cut down the log length by removing the beginning timestamps up to "kernel:"? i.e, only show "[ 7372.....] xxxx" is fine. :)

Quoted 33 lines

^C

With this patch, the test works well.

Signed-off-by Younger Liu <[email protected]>
---
 fs/ocfs2/file.c    |    6 +-----
 fs/ocfs2/journal.c |   34 ++++++++++++++++++++++++++++++++++
 fs/ocfs2/journal.h |   11 +++++++++++
 3 files changed, 46 insertions(+), 5 deletions(-)
fs/ocfs2/file.c +1 -5
index 05c0bb1..4943918 100644
@@ -666,11 +666,7 @@ restarted_transaction:
 		} else {
 			BUG_ON(why != RESTART_TRANS);
 
-			/* TODO: This can be more intelligent. */
-			credits = ocfs2_calc_extend_credits(osb->sb,
-							    &fe->id2.i_list,
-							    clusters_to_add);
-			status = ocfs2_extend_trans(handle, credits);
+			status = ocfs2_allocate_extend_trans(handle, 1);
 			if (status < 0) {
 				/* handle still has to be committed at
 				 * this point. */
fs/ocfs2/journal.c +0 -0
index 8eccfab..501b2fe 100644

fs/ocfs2/journal.c bail: · line 462

Quoted 8 lines
fs/ocfs2/journal.c +5 -0
@@ -455,6 +455,40 @@ bail:
 	return status;
 }
 
+/*
+ * If we have fewer than thresh credits, extend by OCFS2_MAX_TRANS_DATA.
+ * If that fails, restart the transaction & regain write access for the
+ * buffer head which is used for metadata modifications.
+ * Refer extend_or_restart_transaction()

* Taken from Ext4: extend_or_restart_transaction()

fs/ocfs2/journal.c bail: · line 472

Quoted 10 lines
fs/ocfs2/journal.c +10 -0
+ */
+int ocfs2_allocate_extend_trans(handle_t *handle, int thresh)
+{
+	int status;
+
+	BUG_ON(!handle);
+	
+	if (handle->h_buffer_credits < thresh)
+		return 0;
+

I wonder if we need a particular trace point or not...

	old_nblks = handle->h_buffer_credits;
	trace_ocfs2_allocate_extend_trans(old_nblks, thresh);

fs/ocfs2/journal.c bail: · line 484

Quoted 12 lines
fs/ocfs2/journal.c +12 -0
+	status = jbd2_journal_extend(handle, OCFS2_MAX_TRANS_DATA);
+	if (status < 0) {
+		mlog_errno(status);
+		goto bail;
+	}
+
+	if (status > 0) {
+		status = jbd2_journal_restart(handle, OCFS2_MAX_TRANS_DATA);
+		if (status < 0) {
+			mlog_errno(status);
+			goto bail;
+		}

		if (status < 0)
			mlog_errno(status);

I'll run some further tests tomorrow, thanks for your patch!

-Jeff

Quoted 32 lines
fs/ocfs2/journal.c +7 -0
+	}
+	
+bail:
+	return status;
+}
+
+
 struct ocfs2_triggers {
 	struct jbd2_buffer_trigger_type	ot_triggers;
 	int				ot_offset;
fs/ocfs2/journal.h +11 -0
index a3385b6..62a26bd 100644
@@ -259,6 +259,17 @@ handle_t		    *ocfs2_start_trans(struct ocfs2_super *osb,
 int			     ocfs2_commit_trans(struct ocfs2_super *osb,
 						handle_t *handle);
 int			     ocfs2_extend_trans(handle_t *handle, int nblocks);
+int			     ocfs2_allocate_extend_trans(handle_t *handle,
+						int thresh);
+
+/* 
+ * Define an arbitrary limit for the amount of data we will anticipate
+ * writing to any given transaction.  For unbounded transactions such as
+ * fallocate(2) we can write more than this, but we always
+ * start off at the maximum transaction size and grow the transaction
+ * optimistically as we go.
+ */
+#define OCFS2_MAX_TRANS_DATA	64U
 
 /*
  * Create access is for when we get a newly created buffer and we're
#2 lore raw

PATCH 1/1 ocfs2: lighten up allocate transaction

Quoted 105 lines · Jeff Liu

Hi Yonger,

Quoted 11 lines · Younger Liu

The issue scenario is as following:
When fallocating a very large disk space for a small file, __ocfs2_extend_allocation attempts to get a very large transaction. For some journal sizes, there may be not enough room for this transaction, and the fallocate will fail.

The patch below extents & restarts the transaction as necessary while allocating space, and should work with even the smallest journal. This patch refers ext4 resize.

Test:

Quoted 11 lines
# mkfs.ocfs2 -b 4K -C 32K -T datafiles /dev/sdc
...(jounral size is 32M)
# mount.ocfs2 /dev/sdc /mnt/ocfs2/
# touch /mnt/ocfs2/1.log
# fallocate -o 0 -l 400G /mnt/ocfs2/1.log
fallocate: /mnt/ocfs2/1.log: fallocate failed: Cannot allocate memory
# tail -f /var/log/messages
Jul  3 19:42:08 linux-KooNDD kernel: [ 7372.278591] JBD: fallocate wants too many credits (2051 > 2048)
Jul  3 19:42:08 linux-KooNDD kernel: [ 7372.278597] (fallocate,6438,0):__ocfs2_extend_allocation:709 ERROR: status = -12
Jul  3 19:42:08 linux-KooNDD kernel: [ 7372.278603] (fallocate,6438,0):ocfs2_allocate_unwritten_extents:1504 ERROR: status = -12
Jul  3 19:42:08 linux-KooNDD kernel: [ 7372.278607] (fallocate,6438,0):__ocfs2_change_file_space:1955 ERROR: status = -12

Could you please cut down the log length by removing the beginning timestamps up to "kernel:"? i.e, only show "[ 7372.....] xxxx" is fine. :)

Quoted 33 lines

^C

With this patch, the test works well.

Signed-off-by Younger Liu <[email protected]>
---
 fs/ocfs2/file.c    |    6 +-----
 fs/ocfs2/journal.c |   34 ++++++++++++++++++++++++++++++++++
 fs/ocfs2/journal.h |   11 +++++++++++
 3 files changed, 46 insertions(+), 5 deletions(-)
fs/ocfs2/file.c +1 -5
index 05c0bb1..4943918 100644
@@ -666,11 +666,7 @@ restarted_transaction:
 		} else {
 			BUG_ON(why != RESTART_TRANS);
 
-			/* TODO: This can be more intelligent. */
-			credits = ocfs2_calc_extend_credits(osb->sb,
-							    &fe->id2.i_list,
-							    clusters_to_add);
-			status = ocfs2_extend_trans(handle, credits);
+			status = ocfs2_allocate_extend_trans(handle, 1);
 			if (status < 0) {
 				/* handle still has to be committed at
 				 * this point. */
fs/ocfs2/journal.c +0 -0
index 8eccfab..501b2fe 100644

fs/ocfs2/journal.c bail: · line 462

Quoted 8 lines
fs/ocfs2/journal.c +5 -0
@@ -455,6 +455,40 @@ bail:
 	return status;
 }
 
+/*
+ * If we have fewer than thresh credits, extend by OCFS2_MAX_TRANS_DATA.
+ * If that fails, restart the transaction & regain write access for the
+ * buffer head which is used for metadata modifications.
+ * Refer extend_or_restart_transaction()

* Taken from Ext4: extend_or_restart_transaction()

fs/ocfs2/journal.c bail: · line 472

Quoted 10 lines
fs/ocfs2/journal.c +10 -0
+ */
+int ocfs2_allocate_extend_trans(handle_t *handle, int thresh)
+{
+	int status;
+
+	BUG_ON(!handle);
+	
+	if (handle->h_buffer_credits < thresh)
+		return 0;
+

I wonder if we need a particular trace point or not...

	old_nblks = handle->h_buffer_credits;
	trace_ocfs2_allocate_extend_trans(old_nblks, thresh);

fs/ocfs2/journal.c bail: · line 484

Quoted 12 lines
fs/ocfs2/journal.c +12 -0
+	status = jbd2_journal_extend(handle, OCFS2_MAX_TRANS_DATA);
+	if (status < 0) {
+		mlog_errno(status);
+		goto bail;
+	}
+
+	if (status > 0) {
+		status = jbd2_journal_restart(handle, OCFS2_MAX_TRANS_DATA);
+		if (status < 0) {
+			mlog_errno(status);
+			goto bail;
+		}

		if (status < 0)
			mlog_errno(status);
Quoted 1 line

I'll run some further tests tomorrow, thanks for your patch!

Ok, so some extra tests against combinations with different block/cluster sizes looks good.

Thanks,
-Jeff

Quoted 41 lines

-Jeff

Quoted 22 lines
fs/ocfs2/journal.c +7 -0
+	}
+	
+bail:
+	return status;
+}
+
+
 struct ocfs2_triggers {
 	struct jbd2_buffer_trigger_type	ot_triggers;
 	int				ot_offset;
fs/ocfs2/journal.h +4 -0
index a3385b6..62a26bd 100644
@@ -259,6 +259,17 @@ handle_t		    *ocfs2_start_trans(struct ocfs2_super *osb,
 int			     ocfs2_commit_trans(struct ocfs2_super *osb,
 						handle_t *handle);
 int			     ocfs2_extend_trans(handle_t *handle, int nblocks);
+int			     ocfs2_allocate_extend_trans(handle_t *handle,
+						int thresh);
+
+/*

fs/ocfs2/journal.h handle_t *ocfs2_start_trans(struct ocfs2_super *osb, · line 275

Quoted 10 lines
fs/ocfs2/journal.h +7 -0
+ * Define an arbitrary limit for the amount of data we will anticipate
+ * writing to any given transaction.  For unbounded transactions such as
+ * fallocate(2) we can write more than this, but we always
+ * start off at the maximum transaction size and grow the transaction
+ * optimistically as we go.
+ */
+#define OCFS2_MAX_TRANS_DATA	64U
 
 /*
  * Create access is for when we get a newly created buffer and we're

_______________________________________________
Ocfs2-devel mailing list
Ocfs2-devel at oss.oracle.com
https://oss.oracle.com/mailman/listinfo/ocfs2-devel

author
#3 lore raw

PATCH 1/1 ocfs2: lighten up allocate transaction

In reply to Jeff Liu
Quoted 27 lines · Jeff Liu

Hi Yonger,

Quoted 11 lines · Younger Liu

The issue scenario is as following:
When fallocating a very large disk space for a small file, __ocfs2_extend_allocation attempts to get a very large transaction. For some journal sizes, there may be not enough room for this transaction, and the fallocate will fail.

The patch below extents & restarts the transaction as necessary while allocating space, and should work with even the smallest journal. This patch refers ext4 resize.

Test:

Quoted 11 lines
# mkfs.ocfs2 -b 4K -C 32K -T datafiles /dev/sdc
...(jounral size is 32M)
# mount.ocfs2 /dev/sdc /mnt/ocfs2/
# touch /mnt/ocfs2/1.log
# fallocate -o 0 -l 400G /mnt/ocfs2/1.log
fallocate: /mnt/ocfs2/1.log: fallocate failed: Cannot allocate memory
# tail -f /var/log/messages
[ 7372.278591] JBD: fallocate wants too many credits (2051 > 2048)
[ 7372.278597] (fallocate,6438,0):__ocfs2_extend_allocation:709 ERROR: status = -12
[ 7372.278603] (fallocate,6438,0):ocfs2_allocate_unwritten_extents:1504 ERROR: status = -12
[ 7372.278607] (fallocate,6438,0):__ocfs2_change_file_space:1955 ERROR: status = -12
Quoted 3 lines

Could you please cut down the log length by removing the beginning timestamps up to "kernel:"? i.e, only show "[ 7372.....] xxxx" is fine. :)

Thanks for your suggestion.

Quoted 56 lines
Quoted 33 lines

^C

With this patch, the test works well.

Signed-off-by Younger Liu <[email protected]>
---
 fs/ocfs2/file.c    |    6 +-----
 fs/ocfs2/journal.c |   34 ++++++++++++++++++++++++++++++++++
 fs/ocfs2/journal.h |   11 +++++++++++
 3 files changed, 46 insertions(+), 5 deletions(-)
fs/ocfs2/file.c +1 -5
index 05c0bb1..4943918 100644
@@ -666,11 +666,7 @@ restarted_transaction:
 		} else {
 			BUG_ON(why != RESTART_TRANS);
 
-			/* TODO: This can be more intelligent. */
-			credits = ocfs2_calc_extend_credits(osb->sb,
-							    &fe->id2.i_list,
-							    clusters_to_add);
-			status = ocfs2_extend_trans(handle, credits);
+			status = ocfs2_allocate_extend_trans(handle, 1);
 			if (status < 0) {
 				/* handle still has to be committed at
 				 * this point. */
fs/ocfs2/journal.c +0 -0
index 8eccfab..501b2fe 100644

fs/ocfs2/journal.c bail: · line 462

Quoted 8 lines
fs/ocfs2/journal.c +5 -0
@@ -455,6 +455,40 @@ bail:
 	return status;
 }
 
+/*
+ * If we have fewer than thresh credits, extend by OCFS2_MAX_TRANS_DATA.
+ * If that fails, restart the transaction & regain write access for the
+ * buffer head which is used for metadata modifications.
+ * Refer extend_or_restart_transaction()

* Taken from Ext4: extend_or_restart_transaction()

fs/ocfs2/journal.c bail: · line 472

Quoted 10 lines
fs/ocfs2/journal.c +10 -0
+ */
+int ocfs2_allocate_extend_trans(handle_t *handle, int thresh)
+{
+	int status;
+
+	BUG_ON(!handle);
+	
+	if (handle->h_buffer_credits < thresh)
+		return 0;
+

I wonder if we need a particular trace point or not...

Quoted 3 lines
	old_nblks = handle->h_buffer_credits;
	trace_ocfs2_allocate_extend_trans(old_nblks, thresh);

Good point for tracer.
It is conveniently for debugging or analyzing some issues too. I will resent the patch in a moment. Please help to review it again. thanks.
--Younger

Quoted 56 lines

fs/ocfs2/journal.c bail: · line 484

Quoted 12 lines
fs/ocfs2/journal.c +12 -0
+	status = jbd2_journal_extend(handle, OCFS2_MAX_TRANS_DATA);
+	if (status < 0) {
+		mlog_errno(status);
+		goto bail;
+	}
+
+	if (status > 0) {
+		status = jbd2_journal_restart(handle, OCFS2_MAX_TRANS_DATA);
+		if (status < 0) {
+			mlog_errno(status);
+			goto bail;
+		}

		if (status < 0)
			mlog_errno(status);

I'll run some further tests tomorrow, thanks for your patch!

-Jeff

Quoted 22 lines
fs/ocfs2/journal.c +7 -0
+	}
+	
+bail:
+	return status;
+}
+
+
 struct ocfs2_triggers {
 	struct jbd2_buffer_trigger_type	ot_triggers;
 	int				ot_offset;
fs/ocfs2/journal.h +4 -0
index a3385b6..62a26bd 100644
@@ -259,6 +259,17 @@ handle_t		    *ocfs2_start_trans(struct ocfs2_super *osb,
 int			     ocfs2_commit_trans(struct ocfs2_super *osb,
 						handle_t *handle);
 int			     ocfs2_extend_trans(handle_t *handle, int nblocks);
+int			     ocfs2_allocate_extend_trans(handle_t *handle,
+						int thresh);
+
+/*

fs/ocfs2/journal.h handle_t *ocfs2_start_trans(struct ocfs2_super *osb, · line 275

Quoted 10 lines
fs/ocfs2/journal.h +7 -0
+ * Define an arbitrary limit for the amount of data we will anticipate
+ * writing to any given transaction.  For unbounded transactions such as
+ * fallocate(2) we can write more than this, but we always
+ * start off at the maximum transaction size and grow the transaction
+ * optimistically as we go.
+ */
+#define OCFS2_MAX_TRANS_DATA	64U
 
 /*
  * Create access is for when we get a newly created buffer and we're

.