From 0dbcb5a4e727d56c41a5b743f12973333084b827 Mon Sep 17 00:00:00 2001
From: Konstantin Osipov <kostja@tarantool.org>
Date: Mon, 2 Apr 2012 11:55:32 +0400
Subject: [PATCH] Fix the failing xlog.test
---
core/log_io.m | 8 ++------
include/log_io.h | 1 -
test/box/xlog.result | 2 +-
3 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/core/log_io.m b/core/log_io.m
index 02ea9639f7..3ef6df8101 100644
--- a/core/log_io.m
+++ b/core/log_io.m
@@ -1316,9 +1316,9 @@ write_to_disk(struct recovery_state *r, struct wal_write_request *req)
if (req == NULL) {
if (wal != NULL)
log_io_close(&wal);
+#if 0
if (wal_to_close != NULL)
log_io_close(&wal_to_close);
-#if 0
recover_free((struct recovery_state*)_state);
#endif
return 0;
@@ -1505,12 +1505,8 @@ recovery_update_mode(struct recovery_state *r, const char *mode,
void
recover_free(struct recovery_state *recovery)
{
- struct child *writer = recovery->wal_writer;
- if (writer && writer->out && writer->out->fd > 0) {
- close(writer->out->fd);
+ if (recovery->writer)
wal_writer_stop(recovery);
- usleep(1000);
- }
v11_class_free(recovery->snap_class);
v11_class_free(recovery->wal_class);
diff --git a/include/log_io.h b/include/log_io.h
index 38dbef60ee..8e5791c328 100644
--- a/include/log_io.h
+++ b/include/log_io.h
@@ -110,7 +110,6 @@ struct recovery_state {
struct log_io *current_wal; /* the WAL we'r currently reading/writing from/to */
struct log_io_class *snap_class;
struct log_io_class *wal_class;
- struct child *wal_writer;
struct wal_writer *writer;
/* row_handler will be presented by most recent format of data
diff --git a/test/box/xlog.result b/test/box/xlog.result
index ba345f63be..8faf70ef7b 100644
--- a/test/box/xlog.result
+++ b/test/box/xlog.result
@@ -16,7 +16,7 @@ Insert OK, 1 row affected
Stopping the server...
00000000000000000004.xlog.inprogress has been successfully renamed
-# An inprogress xlog fle with one record must be renamed during recovery.
+# An inprogress xlog file with one record must be renamed during recovery.
00000000000000000005.xlog.inprogress hash been successfully renamed
--
GitLab