Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
T
tarantool
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
core
tarantool
Commits
0dbcb5a4
Commit
0dbcb5a4
authored
12 years ago
by
Konstantin Osipov
Browse files
Options
Downloads
Patches
Plain Diff
Fix the failing xlog.test
parent
6392132d
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
core/log_io.m
+2
-6
2 additions, 6 deletions
core/log_io.m
include/log_io.h
+0
-1
0 additions, 1 deletion
include/log_io.h
test/box/xlog.result
+1
-1
1 addition, 1 deletion
test/box/xlog.result
with
3 additions
and
8 deletions
core/log_io.m
+
2
−
6
View file @
0dbcb5a4
...
...
@@ -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);
...
...
This diff is collapsed.
Click to expand it.
include/log_io.h
+
0
−
1
View file @
0dbcb5a4
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
test/box/xlog.result
+
1
−
1
View file @
0dbcb5a4
...
...
@@ -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 f
i
le with one record must be renamed during recovery.
00000000000000000005.xlog.inprogress hash been successfully renamed
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment