Skip to content
Snippets Groups Projects
Commit 0dbcb5a4 authored by Konstantin Osipov's avatar Konstantin Osipov
Browse files

Fix the failing xlog.test

parent 6392132d
No related branches found
No related tags found
No related merge requests found
......@@ -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);
......
......@@ -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
......
......@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment