Hangleton commented on code in PR #13535: URL: https://github.com/apache/kafka/pull/13535#discussion_r1183397975
########## core/src/main/java/kafka/log/remote/RemoteLogReader.java: ########## @@ -0,0 +1,70 @@ +/* + * 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 kafka.log.remote; + +import org.apache.kafka.common.errors.OffsetOutOfRangeException; +import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.storage.internals.log.FetchDataInfo; +import org.apache.kafka.storage.internals.log.RemoteStorageFetchInfo; +import org.slf4j.Logger; + +import java.util.Optional; +import java.util.concurrent.Callable; +import java.util.function.Consumer; + +public class RemoteLogReader implements Callable<Void> { + + private final Logger logger; + private final RemoteStorageFetchInfo fetchInfo; + private final RemoteLogManager rlm; + private final Consumer<RemoteLogReadResult> callback; + + public RemoteLogReader(RemoteStorageFetchInfo fetchInfo, + RemoteLogManager rlm, + Consumer<RemoteLogReadResult> callback) { + this.fetchInfo = fetchInfo; + this.rlm = rlm; + this.callback = callback; + logger = new LogContext() { + @Override + public String logPrefix() { + return "[" + Thread.currentThread().getName() + "]"; + } + }.logger(RemoteLogReader.class); + } + + @Override + public Void call() { + RemoteLogReadResult result; + try { + logger.debug("Reading records from remote storage for topic partition {}", fetchInfo.topicPartition); + + FetchDataInfo fetchDataInfo = rlm.read(fetchInfo); + result = new RemoteLogReadResult(Optional.of(fetchDataInfo), Optional.empty()); + } catch (OffsetOutOfRangeException e) { + result = new RemoteLogReadResult(Optional.empty(), Optional.of(e)); + } catch (Exception e) { + logger.error("Error occurred while reading the remote data for {}", fetchInfo.topicPartition, e); + result = new RemoteLogReadResult(Optional.empty(), Optional.of(e)); + } + + logger.debug("Finished reading records from remote storage for topic partition {}", fetchInfo.topicPartition); Review Comment: Should we report of offset out of range when applicable? ########## core/src/test/java/kafka/log/remote/RemoteLogReaderTest.java: ########## @@ -0,0 +1,83 @@ +/* + * 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 kafka.log.remote; + +import org.apache.kafka.common.TopicPartition; +import org.apache.kafka.common.errors.OffsetOutOfRangeException; +import org.apache.kafka.common.record.Records; +import org.apache.kafka.server.log.remote.storage.RemoteStorageException; +import org.apache.kafka.storage.internals.log.FetchDataInfo; +import org.apache.kafka.storage.internals.log.LogOffsetMetadata; +import org.apache.kafka.storage.internals.log.RemoteLogReadResult; +import org.apache.kafka.storage.internals.log.RemoteStorageFetchInfo; +import org.junit.jupiter.api.Test; +import org.mockito.ArgumentCaptor; + +import java.io.IOException; +import java.util.function.Consumer; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +public class RemoteLogReaderTest { + RemoteLogManager mockRLM = mock(RemoteLogManager.class); + LogOffsetMetadata logOffsetMetadata = new LogOffsetMetadata(100); + Records records = mock(Records.class); + + + @Test + public void testRemoteLogReaderWithoutError() throws RemoteStorageException, IOException { + FetchDataInfo fetchDataInfo = new FetchDataInfo(logOffsetMetadata, records); + when(mockRLM.read(any(RemoteStorageFetchInfo.class))).thenReturn(fetchDataInfo); + + Consumer<RemoteLogReadResult> callback = mock(Consumer.class); + RemoteStorageFetchInfo remoteStorageFetchInfo = new RemoteStorageFetchInfo(0, false, new TopicPartition("test", 0), null, null, false); + RemoteLogReader remoteLogReader = new RemoteLogReader(remoteStorageFetchInfo, mockRLM, callback); + remoteLogReader.call(); + + // verify the callback did get invoked with the expected remoteLogReadResult + ArgumentCaptor<RemoteLogReadResult> remoteLogReadResultArg = ArgumentCaptor.forClass(RemoteLogReadResult.class); + verify(callback, times(1)).accept(remoteLogReadResultArg.capture()); + RemoteLogReadResult actualRemoteLogReadResult = remoteLogReadResultArg.getValue(); + assertFalse(actualRemoteLogReadResult.error.isPresent()); + assertTrue(actualRemoteLogReadResult.fetchDataInfo.isPresent()); + assertEquals(fetchDataInfo, actualRemoteLogReadResult.fetchDataInfo.get()); + } + + @Test + public void testRemoteLogReaderWithError() throws RemoteStorageException, IOException { Review Comment: Should we test cases where the plugins throw an exception? ########## core/src/main/java/kafka/log/remote/RemoteLogReader.java: ########## @@ -0,0 +1,70 @@ +/* + * 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 kafka.log.remote; + +import org.apache.kafka.common.errors.OffsetOutOfRangeException; +import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.storage.internals.log.FetchDataInfo; +import org.apache.kafka.storage.internals.log.RemoteLogReadResult; +import org.apache.kafka.storage.internals.log.RemoteStorageFetchInfo; +import org.slf4j.Logger; + +import java.util.Optional; +import java.util.concurrent.Callable; +import java.util.function.Consumer; + +public class RemoteLogReader implements Callable<Void> { + private final Logger logger; + private final RemoteStorageFetchInfo fetchInfo; + private final RemoteLogManager rlm; + private final Consumer<RemoteLogReadResult> callback; + + public RemoteLogReader(RemoteStorageFetchInfo fetchInfo, + RemoteLogManager rlm, + Consumer<RemoteLogReadResult> callback) { + this.fetchInfo = fetchInfo; + this.rlm = rlm; + this.callback = callback; + logger = new LogContext() { + @Override + public String logPrefix() { + return "[" + Thread.currentThread().getName() + "]"; + } + }.logger(RemoteLogReader.class); + } + + @Override + public Void call() { + RemoteLogReadResult result; + try { + logger.debug("Reading records from remote storage for topic partition {}", fetchInfo.topicPartition); + + FetchDataInfo fetchDataInfo = rlm.read(fetchInfo); + result = new RemoteLogReadResult(Optional.of(fetchDataInfo), Optional.empty()); + } catch (OffsetOutOfRangeException e) { + result = new RemoteLogReadResult(Optional.empty(), Optional.of(e)); + } catch (Exception e) { Review Comment: Not specific to this code path but one downside of not propagating interrupt exception from the plugins is that they are logged as exceptions in Kafka server logs. It may be preferable to avoid this by handling these interrupt as first-class exceptions. What do you think? -- 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. To unsubscribe, e-mail: jira-unsubscr...@kafka.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
