Skip to content
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

fix(downsample): skip reading partkey from raw during full migration #1699

Merged
merged 1 commit into from
Jan 9, 2024
+7 −5
Merged

fix(downsample): skip reading partkey from raw during full migration #1699

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
12 changes: 7 additions & 5 deletions spark-jobs/src/main/scala/filodb/downsampler/index/DSIndexJob.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,14 +68,14 @@ class DSIndexJob(dsSettings: DownsamplerSettings,
DownsamplerContext.dsLogger.info(s"Starting Full PartKey Migration for shard=$shard")
val partKeys = rawDataSource.scanPartKeys(ref = rawDatasetRef,
shard = shard.toInt)
count += migrateWithDownsamplePartKeys(partKeys, shard)
count += migrateWithDownsamplePartKeys(partKeys, shard, fullIndexMigration)
DownsamplerContext.dsLogger.info(s"Successfully Completed Full PartKey Migration for shard=$shard count=$count")
} else {
DownsamplerContext.dsLogger.info(s"Starting Partial PartKey Migration for shard=$shard")
for (epochHour <- fromHour until toHourExcl) {
val partKeys = rawDataSource.getPartKeysByUpdateHour(ref = rawDatasetRef,
shard = shard.toInt, updateHour = epochHour)
count += migrateWithDownsamplePartKeys(partKeys, shard)
count += migrateWithDownsamplePartKeys(partKeys, shard, fullIndexMigration)
}
DownsamplerContext.dsLogger.info(s"Successfully Completed Partial PartKey Migration for shard=$shard " +
s"count=$count fromHour=$fromHour toHourExcl=$toHourExcl")
Expand All @@ -92,7 +92,8 @@ class DSIndexJob(dsSettings: DownsamplerSettings,
Thread.sleep(62000) // quick & dirty hack to ensure that the completed metric gets published
}

def migrateWithDownsamplePartKeys(partKeys: Observable[PartKeyRecord], shard: Int): Int = {
def migrateWithDownsamplePartKeys(partKeys: Observable[PartKeyRecord], shard: Int,
fullIndexMigration: Boolean): Int = {
@volatile var count = 0
val rawDataSource = rawCassandraColStore
val pkRecords = partKeys.filter { pk =>
Expand All @@ -116,8 +117,9 @@ class DSIndexJob(dsSettings: DownsamplerSettings,
if (eligible) count += 1
eligible
}
}.map(pkr => rawDataSource.getPartKeyRecordOrDefault(ref = rawDatasetRef, shard = shard,
pkr = pkr)) // Merge with persisted (if exists) partKey.
}.map(pkr => if (fullIndexMigration) pkr
else rawDataSource.getPartKeyRecordOrDefault(ref = rawDatasetRef, shard = shard,
pkr = pkr)) // Merge with persisted (if exists) partKey.
.map(toDownsamplePkrWithHash)
val updateHour = System.currentTimeMillis() / 1000 / 60 / 60
Await.result(dsDatasource.writePartKeys(ref = dsDatasetRef, shard = shard,
Expand Down
Loading