Skip to content

Fix wrong calculation in history delete dao #10643

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
wu-sheng merged 1 commit into from
Apr 4, 2023
Merged

Fix wrong calculation in history delete dao #10643

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
49 changes: 33 additions & 16 deletions ...rc/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/common/TableHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
import com.google.common.cache.CacheBuilder;
import com.google.common.cache.CacheLoader;
import com.google.common.cache.LoadingCache;
import com.google.common.collect.Range;
import lombok.AccessLevel;
import lombok.Getter;
import lombok.NonNull;
Expand Down Expand Up @@ -114,11 +113,7 @@ public List<String> getTablesForRead(String modelName, long timeBucketStart, lon
return Collections.singletonList(rawTableName);
}

final var ttlTimeBucketRange = getTTLTimeBucketRange(model);
final var ttlTables =
LongStream.rangeClosed(ttlTimeBucketRange.lowerEndpoint(), ttlTimeBucketRange.upperEndpoint())
.mapToObj(it -> getTable(rawTableName, it))
.collect(toList());
final var ttlTables = getTablesWithinTTL(modelName);
return getTablesInTimeBucketRange(modelName, timeBucketStart, timeBucketEnd)
.stream()
.filter(ttlTables::contains)
Expand All @@ -143,20 +138,40 @@ public List<String> getTablesInTimeBucketRange(String modelName, long timeBucket
return Collections.singletonList(rawTableName);
}

timeBucketStart = TimeBucket.getTimeBucket(TimeBucket.getTimestamp(timeBucketStart), DownSampling.Day);
timeBucketEnd = TimeBucket.getTimeBucket(TimeBucket.getTimestamp(timeBucketEnd), DownSampling.Day);
final var timestampStart = TimeBucket.getTimestamp(timeBucketStart);
final var timestampEnd = TimeBucket.getTimestamp(timeBucketEnd);
final var timeBuckets = LongStream.builder();
for (var timestamp = timestampStart; timestamp <= timestampEnd; timestamp += TimeUnit.DAYS.toMillis(1)) {
timeBuckets.add(TimeBucket.getTimeBucket(timestamp, DownSampling.Day));
}

return LongStream
.rangeClosed(timeBucketStart, timeBucketEnd)
return timeBuckets
.build()
.distinct()
.mapToObj(timeBucket -> getTable(rawTableName, timeBucket))
.collect(toList());
}

public List<String> getTablesWithinTTL(String modelName) {
final var model = TableMetaInfo.get(modelName);
final var range = getTTLTimeBucketRange(model);
return getTablesForRead(modelName, range.lowerEndpoint(), range.upperEndpoint());
final var rawTableName = getTableName(model);

if (!model.isTimeSeries()) {
return Collections.singletonList(rawTableName);
}

final var ttlTimeBuckets = getTTLTimeBuckets(model);
return ttlTimeBuckets
.stream()
.map(it -> getTable(rawTableName, it))
.filter(table -> {
try {
return tableExistence.get(table);
} catch (Exception e) {
throw new RuntimeException(e);
}
})
.collect(toList());
}

public static String generateId(Model model, String originalID) {
Expand All @@ -182,12 +197,14 @@ public static long getTimeBucket(String table) {
return Long.parseLong(split[split.length - 1]);
}

Range<Long> getTTLTimeBucketRange(Model model) {
List<Long> getTTLTimeBuckets(Model model) {
final var ttl = model.isRecord() ?
getConfigService().getRecordDataTTL() :
getConfigService().getMetricsDataTTL();
final var timeBucketEnd = TimeBucket.getTimeBucket(System.currentTimeMillis(), DownSampling.Day);
final var timeBucketStart = TimeBucket.getTimeBucket(System.currentTimeMillis() - TimeUnit.DAYS.toMillis(ttl), DownSampling.Day);
return Range.closed(timeBucketStart, timeBucketEnd);
return LongStream
.rangeClosed(0, ttl)
.mapToObj(it -> TimeBucket.getTimeBucket(System.currentTimeMillis() - TimeUnit.DAYS.toMillis(it), DownSampling.Day))
.distinct()
.collect(toList());
}
}
2 changes: 1 addition & 1 deletion ...org/apache/skywalking/oap/server/storage/plugin/jdbc/common/dao/JDBCHistoryDeleteDAO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ public class JDBCHistoryDeleteDAO implements IHistoryDeleteDAO {
@SneakyThrows
public void deleteHistory(Model model, String timeBucketColumnName, int ttl) {
final var endTimeBucket = TimeBucket.getTimeBucket(clock.millis() + TimeUnit.DAYS.toMillis(1), DownSampling.Day);
final var startTimeBucket = endTimeBucket - ttl - 1;
final var startTimeBucket = TimeBucket.getTimeBucket(clock.millis() - TimeUnit.DAYS.toMillis(ttl), DownSampling.Day);
log.info(
"Deleting history data, ttl: {}, now: {}. Keep [{}, {}]",
ttl,
Expand Down