Hi,
Pushed this to wip-journal-header, see
https://github.com/ceph/ceph/pull/2139
We'll run this through the regression suite before merging.
Thanks!
sage
On Wed, 23 Jul 2014, Ma, Jianpeng wrote:
> When closing journal, it should check must_write_header and update
> journal header if must_write_header alreay set.
> It can reduce the nosense journal-replay after restarting osd.
>
> Signed-off-by: Ma Jianpeng <[email protected]>
> ---
> src/os/FileJournal.cc | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/src/os/FileJournal.cc b/src/os/FileJournal.cc
> index 7eb7927..5649e6d 100644
> --- a/src/os/FileJournal.cc
> +++ b/src/os/FileJournal.cc
> @@ -544,6 +544,7 @@ void FileJournal::close()
>
> // close
> assert(writeq_empty());
> + assert(!must_write_header);
> assert(fd >= 0);
> VOID_TEMP_FAILURE_RETRY(::close(fd));
> fd = -1;
> @@ -1102,7 +1103,7 @@ void FileJournal::write_thread_entry()
> while (1) {
> {
> Mutex::Locker locker(writeq_lock);
> - if (writeq.empty()) {
> + if (writeq.empty() && !must_write_header) {
> if (write_stop)
> break;
> dout(20) << "write_thread_entry going to sleep" << dendl;
> --
> 1.9.1
>
> --
> To unsubscribe from this list: send the line "unsubscribe ceph-devel" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
>
--
To unsubscribe from this list: send the line "unsubscribe ceph-devel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
