Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[3.5] Fix issue with cache allocation statistics. (#10029) 

* Fix issue with cache allocation statistics.

* updated CHANGELOG
This commit is contained in:
Dan Larkin-York 2019-09-27 07:31:36 -04:00 committed by KVS85
parent db77840ef7
commit 50b1f72b25
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG
View File

@ -1,6 +1,9 @@
v3.5.1 (XXXX-XX-XX) v3.5.1 (XXXX-XX-XX)
------------------- -------------------
* Fixed a bug in the edge cache's internal memory accounting, which led
to the edge cache underreporting its current memory usage.
* Fixed "ArangoDB is not running in cluster mode" errors in active failover setups. * Fixed "ArangoDB is not running in cluster mode" errors in active failover setups.
This affected at least /_admin/cluster/health. This affected at least /_admin/cluster/health.

6
arangod/Cache/Cache.cpp
View File

@ -361,12 +361,12 @@ void Cache::shutdown() {
} }
_manager->reclaimTable(std::atomic_load(&_tableShrdPtr)); _manager->reclaimTable(std::atomic_load(&_tableShrdPtr));
_metadata.writeLock();
_metadata.changeTable(0);
_metadata.writeUnlock();
_manager->unregisterCache(_id); _manager->unregisterCache(_id);
_table.store(nullptr, std::memory_order_relaxed); _table.store(nullptr, std::memory_order_relaxed);
} }
_metadata.writeLock();
_metadata.changeTable(0);
_metadata.writeUnlock();
_taskLock.writeUnlock(); _taskLock.writeUnlock();
} }