From e126d26cca658cd42af2bdd2427fc8d236e9fb19 Mon Sep 17 00:00:00 2001
From: Roman Tsisyk <roman@tarantool.org>
Date: Thu, 15 Jun 2017 18:38:42 +0300
Subject: [PATCH] Rename snapshot_daemon to checkpoint_daemon
Follow up #2496
---
src/box/CMakeLists.txt | 2 +-
src/box/lua/{snapshot_daemon.lua => checkpoint_daemon.lua} | 4 ++--
src/box/lua/init.c | 4 ++--
src/box/lua/load_cfg.lua | 2 +-
.../xlog/{snapshot_daemon.result => checkpoint_daemon.result} | 4 ++--
.../{snapshot_daemon.test.lua => checkpoint_daemon.test.lua} | 4 ++--
6 files changed, 10 insertions(+), 10 deletions(-)
rename src/box/lua/{snapshot_daemon.lua => checkpoint_daemon.lua} (98%)
rename test/xlog/{snapshot_daemon.result => checkpoint_daemon.result} (97%)
rename test/xlog/{snapshot_daemon.test.lua => checkpoint_daemon.test.lua} (97%)
diff --git a/src/box/CMakeLists.txt b/src/box/CMakeLists.txt
index 8e9cafea00..11ec81e623 100644
--- a/src/box/CMakeLists.txt
+++ b/src/box/CMakeLists.txt
@@ -5,7 +5,7 @@ lua_source(lua_sources lua/load_cfg.lua)
lua_source(lua_sources lua/schema.lua)
lua_source(lua_sources lua/tuple.lua)
lua_source(lua_sources lua/session.lua)
-lua_source(lua_sources lua/snapshot_daemon.lua)
+lua_source(lua_sources lua/checkpoint_daemon.lua)
lua_source(lua_sources lua/net_box.lua)
lua_source(lua_sources lua/upgrade.lua)
lua_source(lua_sources lua/console.lua)
diff --git a/src/box/lua/snapshot_daemon.lua b/src/box/lua/checkpoint_daemon.lua
similarity index 98%
rename from src/box/lua/snapshot_daemon.lua
rename to src/box/lua/checkpoint_daemon.lua
index 3543e29b12..686ea81035 100644
--- a/src/box/lua/snapshot_daemon.lua
+++ b/src/box/lua/checkpoint_daemon.lua
@@ -1,4 +1,4 @@
--- snapshot_daemon.lua (internal file)
+-- checkpoint_daemon.lua (internal file)
local log = require 'log'
local fiber = require 'fiber'
@@ -8,7 +8,7 @@ local errno = require 'errno'
local digest = require 'digest'
local pickle = require 'pickle'
-local PREFIX = 'snapshot_daemon'
+local PREFIX = 'checkpoint_daemon'
local daemon = {
checkpoint_interval = 0;
diff --git a/src/box/lua/init.c b/src/box/lua/init.c
index d9fef7638a..0e3ceff26c 100644
--- a/src/box/lua/init.c
+++ b/src/box/lua/init.c
@@ -61,7 +61,7 @@ extern char session_lua[],
tuple_lua[],
schema_lua[],
load_cfg_lua[],
- snapshot_daemon_lua[],
+ checkpoint_daemon_lua[],
net_box_lua[],
upgrade_lua[],
console_lua[];
@@ -70,7 +70,7 @@ static const char *lua_sources[] = {
"box/session", session_lua,
"box/tuple", tuple_lua,
"box/schema", schema_lua,
- "box/snapshot_daemon", snapshot_daemon_lua,
+ "box/checkpoint_daemon", checkpoint_daemon_lua,
"box/upgrade", upgrade_lua,
"box/net_box", net_box_lua,
"box/console", console_lua,
diff --git a/src/box/lua/load_cfg.lua b/src/box/lua/load_cfg.lua
index 66790ba77c..8bd1595819 100644
--- a/src/box/lua/load_cfg.lua
+++ b/src/box/lua/load_cfg.lua
@@ -143,7 +143,7 @@ local dynamic_cfg = {
read_only = private.cfg_set_read_only,
vinyl_timeout = private.cfg_update_vinyl_options,
checkpoint_count = private.cfg_set_checkpoint_count,
- checkpoint_interval = private.snapshot_daemon.set_checkpoint_interval,
+ checkpoint_interval = private.checkpoint_daemon.set_checkpoint_interval,
-- do nothing, affects new replicas, which query this value on start
wal_dir_rescan_delay = function() end,
custom_proc_title = function()
diff --git a/test/xlog/snapshot_daemon.result b/test/xlog/checkpoint_daemon.result
similarity index 97%
rename from test/xlog/snapshot_daemon.result
rename to test/xlog/checkpoint_daemon.result
index 4555a14ed4..dd0b7de6fd 100644
--- a/test/xlog/snapshot_daemon.result
+++ b/test/xlog/checkpoint_daemon.result
@@ -25,7 +25,7 @@ PERIOD = 0.03
if jit.os ~= 'Linux' then PERIOD = 1.5 end
---
...
-space = box.schema.space.create('snapshot_daemon')
+space = box.schema.space.create('checkpoint_daemon')
---
...
index = space:create_index('pk', { type = 'tree', parts = { 1, 'unsigned' }})
@@ -96,7 +96,7 @@ box.cfg{checkpoint_interval = 3600 * 4, checkpoint_count = 4 }
space:drop()
---
...
-daemon = box.internal.snapshot_daemon
+daemon = box.internal.checkpoint_daemon
---
...
-- stop daemon
diff --git a/test/xlog/snapshot_daemon.test.lua b/test/xlog/checkpoint_daemon.test.lua
similarity index 97%
rename from test/xlog/snapshot_daemon.test.lua
rename to test/xlog/checkpoint_daemon.test.lua
index 59337e5030..55d7defd94 100644
--- a/test/xlog/snapshot_daemon.test.lua
+++ b/test/xlog/checkpoint_daemon.test.lua
@@ -12,7 +12,7 @@ PERIOD = 0.03
if jit.os ~= 'Linux' then PERIOD = 1.5 end
-space = box.schema.space.create('snapshot_daemon')
+space = box.schema.space.create('checkpoint_daemon')
index = space:create_index('pk', { type = 'tree', parts = { 1, 'unsigned' }})
@@ -57,7 +57,7 @@ fio.basename(snaps[1], '.snap') >= fio.basename(xlogs[1], '.xlog')
box.cfg{checkpoint_interval = 3600 * 4, checkpoint_count = 4 }
space:drop()
-daemon = box.internal.snapshot_daemon
+daemon = box.internal.checkpoint_daemon
-- stop daemon
box.cfg{ checkpoint_interval = 0 }
-- wait daemon to stop
--
GitLab