Skip to content

Commit

Permalink
fix NPE and other exceptions thrown when work fails to process before…
Browse files Browse the repository at this point in the history
… work execution (apache#32566)
  • Loading branch information
m-trieu authored and Naireen committed Sep 26, 2024
1 parent af0570d commit 704b133
Show file tree
Hide file tree
Showing 2 changed files with 86 additions and 11 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@
import org.apache.beam.sdk.values.TupleTag;
import org.apache.beam.vendor.grpc.v1p60p1.com.google.protobuf.ByteString;
import org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.annotations.VisibleForTesting;
import org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.base.Preconditions;
import org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.base.Supplier;
import org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.collect.FluentIterable;
import org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.collect.HashBasedTable;
Expand Down Expand Up @@ -129,7 +128,7 @@ public class StreamingModeExecutionContext extends DataflowExecutionContext<Step
*/
private @Nullable Object key = null;

private Work work;
private @Nullable Work work;
private WindmillComputationKey computationKey;
private SideInputStateFetcher sideInputStateFetcher;
// OperationalLimits is updated in start() because a StreamingModeExecutionContext can
Expand Down Expand Up @@ -304,9 +303,9 @@ private <T> SideInput<T> fetchSideInput(
return fetchSideInputFromWindmill(
view,
sideInputWindow,
Preconditions.checkNotNull(stateFamily),
checkNotNull(stateFamily),
state,
Preconditions.checkNotNull(scopedReadStateSupplier),
checkNotNull(scopedReadStateSupplier),
tagCache);
}

Expand All @@ -329,27 +328,31 @@ private <T> SideInput<T> fetchSideInputFromWindmill(
}

public Iterable<Windmill.GlobalDataId> getSideInputNotifications() {
return work.getWorkItem().getGlobalDataIdNotificationsList();
return getWorkItem().getGlobalDataIdNotificationsList();
}

private List<Timer> getFiredTimers() {
return work.getWorkItem().getTimers().getTimersList();
return getWorkItem().getTimers().getTimersList();
}

public @Nullable ByteString getSerializedKey() {
return work.getWorkItem().getKey();
return work == null ? null : work.getWorkItem().getKey();
}

public WindmillComputationKey getComputationKey() {
return computationKey;
}

public long getWorkToken() {
return work.getWorkItem().getWorkToken();
return getWorkItem().getWorkToken();
}

public Windmill.WorkItem getWorkItem() {
return work.getWorkItem();
return checkNotNull(
work,
"work is null. A call to StreamingModeExecutionContext.start(...) is required to set"
+ " work for execution.")
.getWorkItem();
}

public Windmill.WorkItemCommitRequest.Builder getOutputBuilder() {
Expand Down Expand Up @@ -390,7 +393,7 @@ public void invalidateCache() {
public UnboundedSource.@Nullable CheckpointMark getReaderCheckpoint(
Coder<? extends UnboundedSource.CheckpointMark> coder) {
try {
ByteString sourceStateState = work.getWorkItem().getSourceState().getState();
ByteString sourceStateState = getWorkItem().getSourceState().getState();
if (sourceStateState.isEmpty()) {
return null;
}
Expand Down Expand Up @@ -737,7 +740,7 @@ public void start(
key,
stateFamily,
stateReader,
work.getWorkItem().getIsNewKey(),
getWorkItem().getIsNewKey(),
cacheForKey.forFamily(stateFamily),
scopedReadStateSupplier);

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.beam.runners.dataflow.worker.streaming;

import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.mock;

import java.util.concurrent.atomic.AtomicBoolean;
import org.apache.beam.runners.core.metrics.ExecutionStateTracker;
import org.apache.beam.runners.dataflow.worker.DataflowWorkExecutor;
import org.apache.beam.runners.dataflow.worker.StreamingModeExecutionContext;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;

@RunWith(JUnit4.class)
public class ComputationWorkExecutorTest {

private final DataflowWorkExecutor dataflowWorkExecutor = mock(DataflowWorkExecutor.class);
private final StreamingModeExecutionContext context = mock(StreamingModeExecutionContext.class);
private ComputationWorkExecutor computationWorkExecutor;

@Before
public void setUp() {
computationWorkExecutor =
ComputationWorkExecutor.builder()
.setWorkExecutor(dataflowWorkExecutor)
.setContext(context)
.setExecutionStateTracker(mock(ExecutionStateTracker.class))
.build();
}

@Test
public void testInvalidate_withoutCallToStart() {
// Call to invalidate w/o a call to start should not fail.
computationWorkExecutor.invalidate();
}

@Test
public void testInvalidate_handlesException() {
AtomicBoolean verifyContextInvalidated = new AtomicBoolean(false);
Throwable e = new RuntimeException("something bad happened 2");
doThrow(e).when(dataflowWorkExecutor).close();
doAnswer(
ignored -> {
verifyContextInvalidated.set(true);
return null;
})
.when(context)
.invalidateCache();
computationWorkExecutor.invalidate();
assertTrue(verifyContextInvalidated.get());
}
}

0 comments on commit 704b133

Please sign in to comment.