cadonna commented on a change in pull request #9262:
URL: https://github.com/apache/kafka/pull/9262#discussion_r490189904
##########
File path:
streams/src/main/java/org/apache/kafka/streams/processor/internals/StateDirectory.java
##########
@@ -306,40 +306,55 @@ public synchronized void clean() {
*/
public synchronized void cleanRemovedTasks(final long cleanupDelayMs) {
try {
- cleanRemovedTasks(cleanupDelayMs, false);
+ cleanRemovedTasksCalledByCleanerThread(cleanupDelayMs);
} catch (final Exception cannotHappen) {
throw new IllegalStateException("Should have swallowed
exception.", cannotHappen);
}
}
- private synchronized void cleanRemovedTasks(final long cleanupDelayMs,
- final boolean manualUserCall)
throws Exception {
- final File[] taskDirs = listAllTaskDirectories();
- if (taskDirs == null || taskDirs.length == 0) {
- return; // nothing to do
- }
-
- for (final File taskDir : taskDirs) {
+ private void cleanRemovedTasksCalledByCleanerThread(final long
cleanupDelayMs) {
+ for (final File taskDir : listAllTaskDirectories()) {
final String dirName = taskDir.getName();
final TaskId id = TaskId.parse(dirName);
if (!locks.containsKey(id)) {
- Exception exception = null;
try {
if (lock(id)) {
final long now = time.milliseconds();
final long lastModifiedMs = taskDir.lastModified();
if (now > lastModifiedMs + cleanupDelayMs) {
log.info("{} Deleting obsolete state directory {}
for task {} as {}ms has elapsed (cleanup delay is {}ms).",
logPrefix(), dirName, id, now -
lastModifiedMs, cleanupDelayMs);
-
- Utils.delete(taskDir,
Collections.singletonList(new File(taskDir, LOCK_FILE_NAME)));
- } else if (manualUserCall) {
- log.info("{} Deleting state directory {} for task
{} as user calling cleanup.",
- logPrefix(), dirName, id);
-
Utils.delete(taskDir,
Collections.singletonList(new File(taskDir, LOCK_FILE_NAME)));
}
}
+ } catch (final OverlappingFileLockException | IOException e) {
+ log.warn("{} Swallowed the following exception during
deletion of obsolete state directory {} for task {}: {}",
+ logPrefix(), dirName, id, e);
+ } finally {
+ try {
+ unlock(id);
+ } catch (final IOException e) {
+ log.warn("{} Swallowed the following exception during
unlocking after " +
+ "deletion of obsolete state directory for task
{}: {}",
+ logPrefix(), dirName, e);
+ }
+ }
+ }
+ }
+ }
+
+ private void cleanRemovedTasksCalledByUser() throws Exception {
+ for (final File taskDir : listAllTaskDirectories()) {
+ final String dirName = taskDir.getName();
+ final TaskId id = TaskId.parse(dirName);
+ if (!locks.containsKey(id)) {
+ Exception exception = null;
+ try {
+ if (lock(id)) {
+ log.info("{} Deleting state directory {} for task {}
as user calling cleanup.",
+ logPrefix(), dirName, id);
+ Utils.delete(taskDir, Collections.singletonList(new
File(taskDir, LOCK_FILE_NAME)));
+ }
} catch (final OverlappingFileLockException | IOException e) {
Review comment:
Good observation! I applied some of your suggestions but left the
`try-catch` statements since they allow to log more specific information about
the encountered error.
##########
File path:
streams/src/main/java/org/apache/kafka/streams/processor/internals/StateDirectory.java
##########
@@ -280,7 +280,7 @@ synchronized void unlock(final TaskId taskId) throws
IOException {
public synchronized void clean() {
// remove task dirs
try {
- cleanRemovedTasks(0, true);
+ cleanRemovedTasksCalledByUser();
} catch (final Exception e) {
// this is already logged within cleanRemovedTasks
Review comment:
I am afraid I do not understand this comment.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
