-
Notifications
You must be signed in to change notification settings - Fork 4.2k
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.
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 NPE and other exceptions thrown when work fails to process before work execution #32566
Changes from 1 commit
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -83,11 +83,11 @@ public final void executeWork( | |
* cannot be reused. | ||
*/ | ||
public final void invalidate() { | ||
context().invalidateCache(); | ||
try { | ||
context().invalidateCache(); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. lets keep it outside and not suppress the exception. I'm not sure about the implications of suppressing the exception here, it is better to fail than operating in an inconsistent state. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Discussed over chat.
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I think either is okay here, since even if we throw it the upper layer suppresses it. But in general it is better to not suppress unexpected exceptions and let the upper layer handle or re-throw it. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Done |
||
workExecutor().close(); | ||
} catch (Exception e) { | ||
LOG.warn("Failed to close map task executor: ", e); | ||
LOG.warn("Failed to invalidate ComputationWorkExecutor: ", e); | ||
} | ||
} | ||
|
||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,71 @@ | ||
/* | ||
* 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 static org.mockito.Mockito.verifyNoInteractions; | ||
|
||
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_handlesException() { | ||
NullPointerException npe = new NullPointerException("something bad happened"); | ||
doThrow(npe).when(context).invalidateCache(); | ||
computationWorkExecutor.invalidate(); | ||
verifyNoInteractions(dataflowWorkExecutor); | ||
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()); | ||
} | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I would just leave it as
work.getWorkItem
, NullpointerException is clearer than IllegalArgumentExceptionThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
checker will complain since we mark
work
field asNullable
nowthis will still throw an NPE with the
checkNotNull
checki added a more clear error message.