8000 Allow startup of arangod with an existing database by jsteemann · Pull Request #14760 · arangodb/arangodb · GitHub
[go: up one dir, main page]
Skip to content

Allow startup of arangod with an existing database #14760

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 10, 2021
Merged

Allow startup of arangod with an existing database #14760

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dbb22a9
Allow startup of arangod with an existing database
jsteemann Sep 10, 2021
2c490c0
Merge branch 'devel' into bug-fix/allow-starting-arangod
jsteemann Sep 10, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
devel
-----

* Allow startup of arangod with an existing database directory that was missing
the ZkdIndex column family.

* Truncate must not trigger intermediate commits while in a streaming
transaction, because that would be against the assumption that
streaming transactions never do intermediate commits.
Expand Down
2 changes: 1 addition & 1 deletion arangod/RocksDBEngine/RocksDBEngine.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -747,7 +747,7 @@ void RocksDBEngine::start() {
auto const replicatedLogsName = RocksDBColumnFamilyManager::name(
RocksDBColumnFamilyManager::Family::ReplicatedLogs);
auto const zkdIndexName = RocksDBColumnFamilyManager::name(
RocksDBColumnFamilyManager::Family::ReplicatedLogs);
RocksDBColumnFamilyManager::Family::ZkdIndex);

for (auto const& it : cfFamilies) {
auto it2 = std::find(existingColumnFamilies.begin(),
Expand Down
0