10000 fix logId check (#14794) · arangodb/arangodb@7cd7389 · GitHub
[go: up one dir, main page]
Skip to content

Commit 7cd7389

Browse files
jsteemannjsteemann
authored
fix logId check (#14794)
1 parent 1196999 commit 7cd7389

File tree

4 files changed

+11
-5
lines changed

4 files changed

+11
-5
lines changed

‎arangod/Pregel/Conductor.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,9 @@ using namespace arangodb;
5656
using namespace arangodb::pregel;
5757
using namespace arangodb::basics;
5858

59-
#define LOG_PREGEL(id, level) LOG_TOPIC(id, level, Logger::PREGEL) << "[job " << _executionNumber << "] "
59+
#define LOG_PREGEL(logId, level) \
60+
LOG_TOPIC(logId, level, Logger::PREGEL) \
61+
<< "[job " << _executionNumber << "] "
6062

6163
const char* arangodb::pregel::ExecutionStateNames[8] = {
6264
"none", "running", "storing", "done",

‎arangod/Pregel/GraphStore.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,9 @@
6161
using namespace arangodb;
6262
using namespace arangodb::pregel;
6363

64-
#define LOG_PREGEL(id, level) LOG_TOPIC(id, level, Logger::PREGEL) << "[job " << _executionNumber << "] "
64+
#define LOG_PREGEL(logId, level) \
65+
LOG_TOPIC(logId, level, Logger::PREGEL) \
66+
<< "[job " << _executionNumber << "] "
6567

6668
namespace {
6769
static constexpr size_t minStringChunkSize = 16 * 1024 * sizeof(char);
@@ -308,7 +310,7 @@ std::unique_ptr<TypedBuffer<M>> createBuffer(WorkerConfig const& config, size_t
308310
template <typename V, typename E>
309311
void GraphStore<V, E>::loadVertices(ShardID const& vertexShard,
310312
std::vector<ShardID> const& edgeShards) {
311-
LOG_PREGEL("24837", DEBUG)
313+
LOG_PREGEL("24838", DEBUG)
312314
<< "Loading from vertex shard " << vertexShard << ", edge shards: " << edgeShards;
313315

314316
transaction::Options trxOpts;

‎arangod/Pregel/Worker.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,9 @@ using namespace arangodb;
5252
using namespace arangodb::basics;
5353
using namespace arangodb::pregel;
5454

55-
#define LOG_PREGEL(id, level) LOG_TOPIC(id, level, Logger::PREGEL) << "[job " << _config.executionNumber() << "] "
55+
#define LOG_PREGEL(logId, level) \
56+
LOG_TOPIC(logId, level, Logger::PREGEL) \
57+
<< "[job " << _config.executionNumber() << "] "
5658

5759
#define MY_READ_LOCKER(obj, lock) \
5860
ReadLocker<ReadWriteLock> obj(&lock, arangodb::basics::LockerType::BLOCKING, \

‎utils/checkLogIds.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ def is_good(status):
1818
return status in (Status.OK, Status.OK_REPLACED)
1919

2020
import re
21-
g_log_topic_pattern = re.compile(r'(?P<macro>LOG_(TOPIC(_IF)?|TRX|QUERY))\((?P<param>[^),]*),(?P<rest>.*)')
21+
g_log_topic_pattern = re.compile(r'(?P<macro>LOG_(TOPIC(_IF)?|TRX|CTX(_IF)?|QUERY|PREGEL))\((?P<param>[^),]*),(?P<rest>.*)')
2222

2323
import hashlib
2424
g_hash_algorithm = hashlib.md5()

0 commit comments

Comments
 (0)
0