thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-26 17:41:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix not initialized last entry in zk

Browse Source
This commit is contained in:
Val 2020-05-11 16:31:14 +03:00
parent 0a860c0c2b
commit 5eea58039c
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Databases/DatabaseReplicated.cpp
View File

@ -99,8 +99,6 @@ DatabaseReplicated::DatabaseReplicated(
if (!current_zookeeper)
{
throw Exception("Can't create replicated database without ZooKeeper", ErrorCodes::NO_ZOOKEEPER);
}
current_zookeeper->createAncestors(zookeeper_path);
@ -109,7 +107,6 @@ DatabaseReplicated::DatabaseReplicated(
// TODO if no last_entry then make it equal to 0 in zk;
// TODO launch a worker here
main_thread = ThreadFromGlobalPool(&DatabaseReplicated::runMainThread, this);
}
@ -126,15 +123,20 @@ void DatabaseReplicated::runMainThread() {
while (!stop_flag) {
attachToThreadGroup();
sleepForSeconds(10);
sleepForSeconds(2);
current_zookeeper = getZooKeeper();
String last_n = current_zookeeper->get(zookeeper_path + "/last_entry", {}, NULL);
String last_n;
if (!current_zookeeper->tryGet(zookeeper_path + "/last_entry", last_n, {}, NULL)) {
continue;
}
size_t last_n_parsed = parse<size_t>(last_n);
LOG_DEBUG(log, "PARSED " << last_n_parsed);
LOG_DEBUG(log, "LOCAL CURRENT " << current_log_entry_n);
while (current_log_entry_n < last_n_parsed) {
current_log_entry_n++;
executeLog(current_log_entry_n);
}
break; // debug purpose
// break; // debug purpose
}
}

2
src/Databases/DatabaseReplicated.h
View File

@ -37,7 +37,7 @@ private:
Context & context; // is it overkiill?
std::unique_ptr<Context> current_context; // to run executeQuery
size_t current_log_entry_n = 0;
std::atomic<size_t> current_log_entry_n = 0;
std::atomic<bool> stop_flag{false};
ThreadFromGlobalPool main_thread;

3
src/Interpreters/DDLWorker.cpp
View File

@ -585,8 +585,7 @@ bool DDLWorker::tryExecuteQuery(const String & query, const DDLTask & task, Exec
try
{
current_context = std::make_unique<Context>(context);
//current_context->getClientInfo().query_kind = ClientInfo::QueryKind::SECONDARY_QUERY;
current_context->from_replicated_log = true;
current_context->getClientInfo().query_kind = ClientInfo::QueryKind::SECONDARY_QUERY;
current_context->setCurrentQueryId(""); // generate random query_id
executeQuery(istr, ostr, false, *current_context, {});
}