From 16a18638f2ace5902eadea3f3f413d0180df671f Mon Sep 17 00:00:00 2001 From: basanets Date: Fri, 19 Apr 2019 11:06:28 +0300 Subject: [PATCH 1/5] Added debug event ttl --- .../src/main/resources/thingsboard.yml | 1 + .../dao/event/CassandraBaseEventDao.java | 22 +++++++++++++++++-- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/application/src/main/resources/thingsboard.yml b/application/src/main/resources/thingsboard.yml index 7fa01ccc05..de62818438 100644 --- a/application/src/main/resources/thingsboard.yml +++ b/application/src/main/resources/thingsboard.yml @@ -166,6 +166,7 @@ cassandra: ts_key_value_partitioning: "${TS_KV_PARTITIONING:MONTHS}" ts_key_value_ttl: "${TS_KV_TTL:0}" events_ttl: "${TS_EVENTS_TTL:0}" + debug_events_ttl: "${DEBUG_EVENTS_TTL:WEEK}" buffer_size: "${CASSANDRA_QUERY_BUFFER_SIZE:200000}" concurrent_limit: "${CASSANDRA_QUERY_CONCURRENT_LIMIT:1000}" permit_max_wait_time: "${PERMIT_MAX_WAIT_TIME:120000}" diff --git a/dao/src/main/java/org/thingsboard/server/dao/event/CassandraBaseEventDao.java b/dao/src/main/java/org/thingsboard/server/dao/event/CassandraBaseEventDao.java index 1273df4f51..5c3591adb1 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/event/CassandraBaseEventDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/event/CassandraBaseEventDao.java @@ -26,6 +26,7 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; +import org.thingsboard.server.common.data.DataConstants; import org.thingsboard.server.common.data.Event; import org.thingsboard.server.common.data.id.EntityId; import org.thingsboard.server.common.data.id.EventId; @@ -69,6 +70,9 @@ public class CassandraBaseEventDao extends CassandraAbstractSearchTimeDao 0){ - insert.using(ttl(ttl)); + + int selectedTtl = entity.getEventType().matches(DataConstants.DEBUG_RULE_NODE) ? toMillis(debugEventsTtl) : ttl; + + if(selectedTtl > 0){ + insert.using(ttl(selectedTtl)); } ResultSetFuture resultSetFuture = executeAsyncWrite(tenantId, insert); return Futures.transform(resultSetFuture, rs -> { @@ -203,4 +211,14 @@ public class CassandraBaseEventDao extends CassandraAbstractSearchTimeDao Date: Fri, 19 Apr 2019 13:18:01 +0300 Subject: [PATCH 2/5] Fixed commit --- dao/src/test/resources/cassandra-test.properties | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dao/src/test/resources/cassandra-test.properties b/dao/src/test/resources/cassandra-test.properties index 151688c41c..17d7887a0a 100644 --- a/dao/src/test/resources/cassandra-test.properties +++ b/dao/src/test/resources/cassandra-test.properties @@ -48,6 +48,8 @@ cassandra.query.ts_key_value_partitioning=HOURS cassandra.query.ts_key_value_ttl=0 +cassandra.query.debug_events_ttl=WEEK + cassandra.query.max_limit_per_request=1000 cassandra.query.buffer_size=100000 cassandra.query.concurrent_limit=1000 From ca60afe068e1d49773fef54108774b170a5aeef8 Mon Sep 17 00:00:00 2001 From: basanets Date: Fri, 19 Apr 2019 15:06:59 +0300 Subject: [PATCH 3/5] Millis to Seconds --- .../thingsboard/server/dao/event/CassandraBaseEventDao.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dao/src/main/java/org/thingsboard/server/dao/event/CassandraBaseEventDao.java b/dao/src/main/java/org/thingsboard/server/dao/event/CassandraBaseEventDao.java index 5c3591adb1..2a55a02770 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/event/CassandraBaseEventDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/event/CassandraBaseEventDao.java @@ -215,9 +215,9 @@ public class CassandraBaseEventDao extends CassandraAbstractSearchTimeDao Date: Fri, 19 Apr 2019 17:21:39 +0300 Subject: [PATCH 4/5] Fixed according to comments --- application/src/main/resources/thingsboard.yml | 3 ++- .../server/dao/event/CassandraBaseEventDao.java | 14 ++------------ 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/application/src/main/resources/thingsboard.yml b/application/src/main/resources/thingsboard.yml index de62818438..0981fd64af 100644 --- a/application/src/main/resources/thingsboard.yml +++ b/application/src/main/resources/thingsboard.yml @@ -166,7 +166,8 @@ cassandra: ts_key_value_partitioning: "${TS_KV_PARTITIONING:MONTHS}" ts_key_value_ttl: "${TS_KV_TTL:0}" events_ttl: "${TS_EVENTS_TTL:0}" - debug_events_ttl: "${DEBUG_EVENTS_TTL:WEEK}" + # Specify TTL of debug log in seconds. The current value corresponds to one week + debug_events_ttl: "${DEBUG_EVENTS_TTL:604800}" buffer_size: "${CASSANDRA_QUERY_BUFFER_SIZE:200000}" concurrent_limit: "${CASSANDRA_QUERY_CONCURRENT_LIMIT:1000}" permit_max_wait_time: "${PERMIT_MAX_WAIT_TIME:120000}" diff --git a/dao/src/main/java/org/thingsboard/server/dao/event/CassandraBaseEventDao.java b/dao/src/main/java/org/thingsboard/server/dao/event/CassandraBaseEventDao.java index 2a55a02770..b2682ab2e2 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/event/CassandraBaseEventDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/event/CassandraBaseEventDao.java @@ -71,7 +71,7 @@ public class CassandraBaseEventDao extends CassandraAbstractSearchTimeDao 0){ insert.using(ttl(selectedTtl)); @@ -211,14 +211,4 @@ public class CassandraBaseEventDao extends CassandraAbstractSearchTimeDao Date: Fri, 19 Apr 2019 17:34:52 +0300 Subject: [PATCH 5/5] Fixed cassandra test properties --- dao/src/test/resources/cassandra-test.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dao/src/test/resources/cassandra-test.properties b/dao/src/test/resources/cassandra-test.properties index 17d7887a0a..af9a4b356f 100644 --- a/dao/src/test/resources/cassandra-test.properties +++ b/dao/src/test/resources/cassandra-test.properties @@ -48,7 +48,7 @@ cassandra.query.ts_key_value_partitioning=HOURS cassandra.query.ts_key_value_ttl=0 -cassandra.query.debug_events_ttl=WEEK +cassandra.query.debug_events_ttl=604800 cassandra.query.max_limit_per_request=1000 cassandra.query.buffer_size=100000