diff --git a/src/box/lua/load_cfg.lua b/src/box/lua/load_cfg.lua
index d5b6967505839da78bad30a1aaf6e602ee9da70c..d9a622e7b3634347eb49fd53e779b25abed59abe 100644
--- a/src/box/lua/load_cfg.lua
+++ b/src/box/lua/load_cfg.lua
@@ -47,7 +47,7 @@ local default_cfg = {
rows_per_wal = 500000,
wal_dir_rescan_delay= 0.1,
panic_on_snap_error = true,
- panic_on_wal_error = false,
+ panic_on_wal_error = true,
replication_source = nil,
custom_proc_title = nil,
pid_file = nil,
diff --git a/src/box/recovery.cc b/src/box/recovery.cc
index bdcc554acabf8794b946cf69700865eb5c6b2b77..2694ce5d156eb94e54cf2bb56ef1dd4e431db89c 100644
--- a/src/box/recovery.cc
+++ b/src/box/recovery.cc
@@ -496,7 +496,6 @@ void
recovery_finalize(struct recovery_state *r, enum wal_mode wal_mode,
int rows_per_wal)
{
-
recovery_stop_local(r);
r->finalize = true;
diff --git a/src/box/request.cc b/src/box/request.cc
index dd8d7eea598db4f4e4313ddd50f574124adbebad..479c1abcf47ffdcee703acb9e16884d39eb01643 100644
--- a/src/box/request.cc
+++ b/src/box/request.cc
@@ -172,7 +172,6 @@ execute_select(struct request *request, struct port *port)
void
request_create(struct request *request, uint32_t type)
{
-
memset(request, 0, sizeof(*request));
request->type = type;
}
diff --git a/src/box/txn.h b/src/box/txn.h
index f2158262e07e61cdebbd88da534d993b62067033..9ae74462dff022b026ceae21a9e80b58a18ad072 100644
--- a/src/box/txn.h
+++ b/src/box/txn.h
@@ -71,7 +71,10 @@ struct txn {
Engine *engine;
/** Engine-specific transaction data */
void *engine_tx;
- /** Triggers on fiber yield and stop to abort transaction for in-memory engine */
+ /**
+ * Triggers on fiber yield and stop to abort transaction
+ * for in-memory engine.
+ */
struct trigger fiber_on_yield, fiber_on_stop;
};
diff --git a/test/app/float_value.result b/test/app/float_value.result
index 76c7acde8226824518866d3967ed1a5df8341316..603693b2eb4e91d105d1a9b5b48478f73cfc4882 100644
--- a/test/app/float_value.result
+++ b/test/app/float_value.result
@@ -15,7 +15,7 @@ box.cfg
14 wal_mode:write
15 wal_dir:.
16 panic_on_snap_error:true
-17 panic_on_wal_error:false
+17 panic_on_wal_error:true
18 log_level:5
19 readahead:16320
20 slab_alloc_maximal:1048576
diff --git a/test/app/init_script.result b/test/app/init_script.result
index d9fe981cd130f6e24888c94ef74990821f66c5f1..b1cac69abde02e98401dba09c5887359b74309ac 100644
--- a/test/app/init_script.result
+++ b/test/app/init_script.result
@@ -19,7 +19,7 @@ box.cfg
14 wal_mode:write
15 rows_per_wal:500000
16 panic_on_snap_error:true
-17 panic_on_wal_error:false
+17 panic_on_wal_error:true
18 wal_dir:.
19 log_level:5
20 readahead:16320
diff --git a/test/box/admin.result b/test/box/admin.result
index bd184b122aff15f7ce27fae3f4727a1c7617eb46..807cff8b1fdc2191de54ab3bfe0745a8b11243df 100644
--- a/test/box/admin.result
+++ b/test/box/admin.result
@@ -38,7 +38,7 @@ box.cfg
wal_mode: write
wal_dir: .
panic_on_snap_error: true
- panic_on_wal_error: false
+ panic_on_wal_error: true
log_level: 5
readahead: 16320
pid_file: tarantool.pid
diff --git a/test/box/cfg.result b/test/box/cfg.result
index e778da3ba3cbc34f1e7bebda6a84633d308e73cb..61e12fb73d441be2a8f7e3918be35412a7201ef0 100644
--- a/test/box/cfg.result
+++ b/test/box/cfg.result
@@ -25,7 +25,7 @@ t
- 'wal_mode: write'
- 'wal_dir: .'
- 'panic_on_snap_error: true'
- - 'panic_on_wal_error: false'
+ - 'panic_on_wal_error: true'
- 'log_level: 5'
- 'readahead: 16320'
- 'pid_file: tarantool.pid'
@@ -59,7 +59,7 @@ t
- 'wal_mode: write'
- 'wal_dir: .'
- 'panic_on_snap_error: true'
- - 'panic_on_wal_error: false'
+ - 'panic_on_wal_error: true'
- 'log_level: 5'
- 'readahead: 16320'
- 'pid_file: tarantool.pid'
diff --git a/test/replication/cluster.test.py b/test/replication/cluster.test.py
index 0f78c3efba9c4c2eecccdf4367255e9ae4c0f197..84872550ef8f0afbc63b1b194a486537e9f940ee 100644
--- a/test/replication/cluster.test.py
+++ b/test/replication/cluster.test.py
@@ -94,17 +94,18 @@ server.admin('box.snapshot()')
print '-------------------------------------------------------------'
print 'gh-434: Assertion if replace _cluster tuple'
print '-------------------------------------------------------------'
+server.stop()
+script = server.script
+server.script = "replication/panic.lua"
+server.deploy()
new_uuid = '8c7ff474-65f9-4abe-81a4-a3e1019bb1ae'
+# Check log message
# Requires panic_on_wal_error = false
server.admin("box.space._cluster:replace{{1, '{0}'}}".format(new_uuid))
server.admin("box.info.server.uuid")
-# Check log message
-server.stop()
-server.start()
-
line = "server UUID changed to " + new_uuid
print "check log line for '%s'" % line
print
@@ -124,6 +125,7 @@ server.admin("box.space._cluster:replace{1, require('uuid').NULL:str()}")
# Cleanup
server.stop()
+server.script = script
server.deploy()
print '-------------------------------------------------------------'
diff --git a/test/replication/panic.lua b/test/replication/panic.lua
new file mode 100644
index 0000000000000000000000000000000000000000..06c7f7eba43189ee90b90b4d6d25e10d02727eed
--- /dev/null
+++ b/test/replication/panic.lua
@@ -0,0 +1,12 @@
+#!/usr/bin/env tarantool
+os = require('os')
+box.cfg({
+ listen = os.getenv("LISTEN"),
+ slab_alloc_arena = 0.1,
+ pid_file = "tarantool.pid",
+ logger = "| cat - >> tarantool.log",
+ panic_on_wal_error = false,
+ custom_proc_title = "master",
+})
+
+require('console').listen(os.getenv('ADMIN'))
diff --git a/test/xlog/xlog.lua b/test/xlog/xlog.lua
index ffe507f860771a457dbd6e3a0a67957d79c0529e..2041feb7c85ce43556df8351f065df579c9fcdf3 100644
--- a/test/xlog/xlog.lua
+++ b/test/xlog/xlog.lua
@@ -5,6 +5,7 @@ box.cfg{
listen = os.getenv("LISTEN"),
slab_alloc_arena = 0.1,
pid_file = "tarantool.pid",
+ panic_on_wal_error = false,
rows_per_wal = 50
}