Skip to content

Fix NPE while handling CheckpointNotice in KafkaSupervisor #5996

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
jon-wei merged 7 commits into from
Jul 14, 2018
Merged

Fix NPE while handling CheckpointNotice in KafkaSupervisor #5996

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2b59c9c
Fix NPE while handling CheckpointNotice
jihoonson Jul 11, 2018
76fca98
Merge branch 'master' of github.com:druid-io/druid into fix-npe-super…
jihoonson Jul 12, 2018
e8f5ab5
fix code style
jihoonson Jul 12, 2018
ba24777
Fix test
jihoonson Jul 12, 2018
da2b22c
fix test
jihoonson Jul 12, 2018
632ab06
add a log for creating a new taskGroup
jihoonson Jul 13, 2018
a5d743f
fix backward compatibility in KafkaIOConfig
jihoonson Jul 13, 2018
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
7 changes: 1 addition & 6 deletions ...ntenance/src/main/java/io/druid/indexing/materializedview/MaterializedViewSupervisor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@
import org.joda.time.Duration;
import org.joda.time.Interval;

import javax.annotation.Nullable;
import java.io.IOException;
import java.util.List;
import java.util.Map;
Expand Down Expand Up @@ -240,11 +239,7 @@ public void reset(DataSourceMetadata dataSourceMetadata)
}

@Override
public void checkpoint(
@Nullable String sequenceName,
@Nullable DataSourceMetadata previousCheckPoint,
@Nullable DataSourceMetadata currentCheckPoint
)
public void checkpoint(int taskGroupId, DataSourceMetadata previousCheckPoint, DataSourceMetadata currentCheckPoint)
Copy link
Copy Markdown
Member

@asdf2014 asdf2014 Jul 12, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Need fix code style issues

Copy link
Copy Markdown
Contributor Author

@jihoonson jihoonson Jul 12, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@asdf2014 thanks for the review! Maybe you saw an old commit. I've resolved all code style issues.

Copy link
Copy Markdown
Member

@asdf2014 asdf2014 Jul 12, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Um.. I am sure. It still exists in the latest version code. 😅

public void checkpoint(int taskGroupId, DataSourceMetadata previousCheckPoint, DataSourceMetadata currentCheckPoint)

should be

public void checkpoint(
      int taskGroupId,
      DataSourceMetadata previousCheckPoint,
      DataSourceMetadata currentCheckPoint
)

Copy link
Copy Markdown
Member

@asdf2014 asdf2014 Jul 12, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I should see the latest version code when i visit https://github.com/apache/incubator-druid/pull/5996/files this page, right?

Copy link
Copy Markdown
Contributor Author

@jihoonson jihoonson Jul 12, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, you're seeing the latest one. That line doesn't exceed 120 columns.

Copy link
Copy Markdown
Member

@asdf2014 asdf2014 Jul 12, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep, you're right.

{
// do nothing
}
Expand Down
7 changes: 4 additions & 3 deletions ...vice/src/main/java/io/druid/indexing/kafka/IncrementalPublishingKafkaIndexTaskRunner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -600,12 +600,13 @@ public void onFailure(Throwable t)
sequences
);
requestPause();
if (!toolbox.getTaskActionClient().submit(new CheckPointDataSourceMetadataAction(
final CheckPointDataSourceMetadataAction checkpointAction = new CheckPointDataSourceMetadataAction(
task.getDataSource(),
ioConfig.getBaseSequenceName(),
ioConfig.getTaskGroupId(),
new KafkaDataSourceMetadata(new KafkaPartitions(topic, sequenceToCheckpoint.getStartOffsets())),
new KafkaDataSourceMetadata(new KafkaPartitions(topic, nextOffsets))
))) {
);
if (!toolbox.getTaskActionClient().submit(checkpointAction)) {
throw new ISE("Checkpoint request with offsets [%s] failed, dying", nextOffsets);
}
}
Expand Down
15 changes: 14 additions & 1 deletion ...ions-core/kafka-indexing-service/src/main/java/io/druid/indexing/kafka/KafkaIOConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,16 @@
import io.druid.segment.indexing.IOConfig;
import org.joda.time.DateTime;

import javax.annotation.Nullable;
import java.util.Map;

public class KafkaIOConfig implements IOConfig
{
private static final boolean DEFAULT_USE_TRANSACTION = true;
private static final boolean DEFAULT_SKIP_OFFSET_GAPS = false;

@Nullable
private final Integer taskGroupId;
private final String baseSequenceName;
private final KafkaPartitions startPartitions;
private final KafkaPartitions endPartitions;
Expand All @@ -44,6 +47,7 @@ public class KafkaIOConfig implements IOConfig

@JsonCreator
public KafkaIOConfig(
@JsonProperty("taskGroupId") @Nullable Integer taskGroupId, // can be null for backward compabitility
@JsonProperty("baseSequenceName") String baseSequenceName,
@JsonProperty("startPartitions") KafkaPartitions startPartitions,
@JsonProperty("endPartitions") KafkaPartitions endPartitions,
Expand All @@ -54,6 +58,7 @@ public KafkaIOConfig(
@JsonProperty("skipOffsetGaps") Boolean skipOffsetGaps
)
{
this.taskGroupId = taskGroupId;
this.baseSequenceName = Preconditions.checkNotNull(baseSequenceName, "baseSequenceName");
this.startPartitions = Preconditions.checkNotNull(startPartitions, "startPartitions");
this.endPartitions = Preconditions.checkNotNull(endPartitions, "endPartitions");
Expand Down Expand Up @@ -83,6 +88,13 @@ public KafkaIOConfig(
}
}

@Nullable
@JsonProperty
public Integer getTaskGroupId()
{
return taskGroupId;
}

@JsonProperty
public String getBaseSequenceName()
{
Expand Down Expand Up @@ -135,7 +147,8 @@ public boolean isSkipOffsetGaps()
public String toString()
{
return "KafkaIOConfig{" +
"baseSequenceName='" + baseSequenceName + '\'' +
"taskGroupId=" + taskGroupId +
", baseSequenceName='" + baseSequenceName + '\'' +
", startPartitions=" + startPartitions +
", endPartitions=" + endPartitions +
", consumerProperties=" + consumerProperties +
Expand Down
Loading