From 8ca6667e8510f2e98c19a9b9d81c02675316a8f0 Mon Sep 17 00:00:00 2001 From: Sergey Yakubov <sergey.yakubov@desy.de> Date: Wed, 16 Feb 2022 12:08:33 +0100 Subject: [PATCH] fix bug when cache_size=0 --- deploy/asapo_services/asap3.tfvars | 3 ++- deploy/asapo_services/scripts/asapo.auto.tfvars.in | 5 ++++- receiver/src/request.cpp | 1 + 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/deploy/asapo_services/asap3.tfvars b/deploy/asapo_services/asap3.tfvars index b9d175760..0ec00f294 100644 --- a/deploy/asapo_services/asap3.tfvars +++ b/deploy/asapo_services/asap3.tfvars @@ -21,7 +21,8 @@ receiver_dataserver_cache_size = 30 #gb receiver_receive_to_disk_threshold = 50 # mb receiver_dataserver_nthreads = 8 receiver_network_modes = "tcp" -receiver_kafka_enabled = true +receiver_kafka_enabled = false +receiver_kafka_metadata_broker_list = "" grafana_total_memory_size = 2000 influxdb_total_memory_size = 2000 diff --git a/deploy/asapo_services/scripts/asapo.auto.tfvars.in b/deploy/asapo_services/scripts/asapo.auto.tfvars.in index a063683c2..334e7119a 100644 --- a/deploy/asapo_services/scripts/asapo.auto.tfvars.in +++ b/deploy/asapo_services/scripts/asapo.auto.tfvars.in @@ -68,4 +68,7 @@ alertmanager_port = 9093 n_receivers = 1 n_brokers = 1 -n_fts = 1 \ No newline at end of file +n_fts = 1 + +receiver_kafka_enabled = false +receiver_kafka_metadata_broker_list = "" diff --git a/receiver/src/request.cpp b/receiver/src/request.cpp index 45f337bdb..35ee43bd5 100644 --- a/receiver/src/request.cpp +++ b/receiver/src/request.cpp @@ -50,6 +50,7 @@ Error Request::PrepareDataBufferAndLockIfNeeded() { auto err = PrepareDataBufferFromCache(); if (err) { log__->Warning(LogMessageWithFields(err).Append(RequestLog("", this))); + cache__ = nullptr; return PrepareDataBufferFromMemory(); } return nullptr; -- GitLab