stream2000 commented on code in PR #9651:
URL: https://github.com/apache/hudi/pull/9651#discussion_r1326822299
##########
hudi-client/hudi-client-common/src/main/java/org/apache/hudi/config/HoodieWriteConfig.java:
##########
@@ -418,6 +418,12 @@ public class HoodieWriteConfig extends HoodieConfig {
.sinceVersion("0.9.0")
.withDocumentation(MarkerType.class);
+ public static final ConfigProperty<Boolean>
INSTANT_STATE_TIMELINE_SERVER_BASED = ConfigProperty
+ .key("hoodie.instant_state.timeline_server_based.enabled")
+ .defaultValue(true)
+ .sinceVersion("1.0.0")
+ .withDocumentation("If enabled, Flink writer get instant state from
timeline server rather than requesting DFS directly");
Review Comment:
done
##########
hudi-flink-datasource/hudi-flink/src/main/java/org/apache/hudi/sink/meta/TimelineBasedCkpMetadata.java:
##########
@@ -0,0 +1,162 @@
+/*
+ * 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.hudi.sink.meta;
+
+import org.apache.hudi.common.table.timeline.dto.InstantStateDTO;
+import org.apache.hudi.config.HoodieWriteConfig;
+import org.apache.hudi.exception.HoodieException;
+import org.apache.hudi.timeline.service.handlers.InstantStateHandler;
+
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.fs.Path;
+import org.apache.http.client.fluent.Request;
+import org.apache.http.client.fluent.Response;
+import org.apache.http.client.utils.URIBuilder;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Stream;
+
+/**
+ * Timeline server based CkpMetadata, will read ckpMessages from
timeline-server instead of from file system directly.
+ */
+public class TimelineBasedCkpMetadata extends CkpMetadata {
+
+ private static final Logger LOG =
LoggerFactory.getLogger(TimelineBasedCkpMetadata.class);
+
+ private final HoodieWriteConfig writeConfig;
+ private final ObjectMapper mapper;
+
+ public TimelineBasedCkpMetadata(FileSystem fs, String basePath, String
uniqueId, HoodieWriteConfig writeConfig) {
+ super(fs, basePath, uniqueId);
+ this.writeConfig = writeConfig;
+ mapper = new ObjectMapper();
+ LOG.info("Timeline server based CkpMetadata enabled");
+ }
+
+ @Override
+ public void startInstant(String instant) {
+ super.startInstant(instant);
+ sendRefreshRequest();
+ }
+
+ @Override
+ public void commitInstant(String instant) {
+ super.commitInstant(instant);
+ sendRefreshRequest();
+ }
+
+ @Override
+ public void abortInstant(String instant) {
+ super.abortInstant(instant);
+ sendRefreshRequest();
+ }
+
+ @Override
+ protected Stream<CkpMessage> fetchCkpMessages(Path ckpMetaPath) throws
IOException {
+ // Read ckp messages from timeline server
+ Stream<CkpMessage> ckpMessageStream;
+ try {
+ List<InstantStateDTO> instantStateDTOList =
executeRequestToTimelineServerWithRetry(
+ InstantStateHandler.ALL_INSTANT_STATE_URL,
getRequestParams(ckpMetaPath.toString()),
+ new TypeReference<List<InstantStateDTO>>() {
+ }, RequestMethod.GET);
+ ckpMessageStream = instantStateDTOList.stream().map(c -> new
CkpMessage(c.getInstant(), c.getState()));
+ } catch (Exception e) {
+ LOG.error("Failed to execute scan ckp metadata, fall back to read from
file system...", e);
+ // If we failed to request timeline server, read ckp messages from file
system directly.
+ ckpMessageStream = super.fetchCkpMessages(ckpMetaPath);
+ }
+ return ckpMessageStream;
+ }
+
+ private Map<String, String> getRequestParams(String dirPath) {
+ return
Collections.singletonMap(InstantStateHandler.INSTANT_STATE_DIR_PATH_PARAM,
dirPath);
+ }
+
+ /**
+ * Refresh the ckp messages that cached in timeline server.
+ */
+ private void sendRefreshRequest() {
+ try {
+ boolean success = executeRequestToTimelineServerWithRetry(
+ InstantStateHandler.REFRESH_INSTANT_STATE,
getRequestParams(path.toString()),
+ new TypeReference<Boolean>() {
+ }, RequestMethod.POST);
+ if (!success) {
+ LOG.warn("Timeline server responses with failed refresh");
+ }
+ } catch (Exception e) {
+ // Do not propagate the exception because the server will also do auto
refresh
+ LOG.error("Failed to execute refresh", e);
+ }
+ }
+
+ private <T> T executeRequestToTimelineServerWithRetry(String requestPath,
Map<String, String> queryParameters,
+ TypeReference
reference, RequestMethod method) {
+ int retry = 5;
+ while (--retry >= 0) {
+ long start = System.currentTimeMillis();
+ try {
+ return executeRequestToTimelineServer(requestPath, queryParameters,
reference, method);
+ } catch (IOException e) {
+ LOG.warn("Failed to execute ckp request (" + requestPath + ") to
timeline server", e);
+ } finally {
+ LOG.info("Execute request : (" + requestPath + "), costs: " +
(System.currentTimeMillis() - start) + " ms");
+ }
+ }
+ throw new HoodieException("Failed to execute ckp request (" + requestPath
+ ")");
Review Comment:
We will catch any exceptions and fallback to file scanning in the caller
side.
##########
hudi-flink-datasource/hudi-flink/src/main/java/org/apache/hudi/sink/meta/TimelineBasedCkpMetadata.java:
##########
@@ -0,0 +1,162 @@
+/*
+ * 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.hudi.sink.meta;
+
+import org.apache.hudi.common.table.timeline.dto.InstantStateDTO;
+import org.apache.hudi.config.HoodieWriteConfig;
+import org.apache.hudi.exception.HoodieException;
+import org.apache.hudi.timeline.service.handlers.InstantStateHandler;
+
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.fs.Path;
+import org.apache.http.client.fluent.Request;
+import org.apache.http.client.fluent.Response;
+import org.apache.http.client.utils.URIBuilder;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Stream;
+
+/**
+ * Timeline server based CkpMetadata, will read ckpMessages from
timeline-server instead of from file system directly.
+ */
+public class TimelineBasedCkpMetadata extends CkpMetadata {
+
+ private static final Logger LOG =
LoggerFactory.getLogger(TimelineBasedCkpMetadata.class);
+
+ private final HoodieWriteConfig writeConfig;
+ private final ObjectMapper mapper;
+
+ public TimelineBasedCkpMetadata(FileSystem fs, String basePath, String
uniqueId, HoodieWriteConfig writeConfig) {
+ super(fs, basePath, uniqueId);
+ this.writeConfig = writeConfig;
+ mapper = new ObjectMapper();
+ LOG.info("Timeline server based CkpMetadata enabled");
+ }
+
+ @Override
+ public void startInstant(String instant) {
+ super.startInstant(instant);
+ sendRefreshRequest();
+ }
+
+ @Override
+ public void commitInstant(String instant) {
+ super.commitInstant(instant);
+ sendRefreshRequest();
+ }
+
+ @Override
+ public void abortInstant(String instant) {
+ super.abortInstant(instant);
+ sendRefreshRequest();
+ }
+
+ @Override
+ protected Stream<CkpMessage> fetchCkpMessages(Path ckpMetaPath) throws
IOException {
+ // Read ckp messages from timeline server
+ Stream<CkpMessage> ckpMessageStream;
+ try {
+ List<InstantStateDTO> instantStateDTOList =
executeRequestToTimelineServerWithRetry(
+ InstantStateHandler.ALL_INSTANT_STATE_URL,
getRequestParams(ckpMetaPath.toString()),
+ new TypeReference<List<InstantStateDTO>>() {
+ }, RequestMethod.GET);
+ ckpMessageStream = instantStateDTOList.stream().map(c -> new
CkpMessage(c.getInstant(), c.getState()));
+ } catch (Exception e) {
+ LOG.error("Failed to execute scan ckp metadata, fall back to read from
file system...", e);
+ // If we failed to request timeline server, read ckp messages from file
system directly.
+ ckpMessageStream = super.fetchCkpMessages(ckpMetaPath);
+ }
+ return ckpMessageStream;
+ }
+
+ private Map<String, String> getRequestParams(String dirPath) {
+ return
Collections.singletonMap(InstantStateHandler.INSTANT_STATE_DIR_PATH_PARAM,
dirPath);
+ }
+
+ /**
+ * Refresh the ckp messages that cached in timeline server.
+ */
+ private void sendRefreshRequest() {
+ try {
+ boolean success = executeRequestToTimelineServerWithRetry(
+ InstantStateHandler.REFRESH_INSTANT_STATE,
getRequestParams(path.toString()),
+ new TypeReference<Boolean>() {
+ }, RequestMethod.POST);
+ if (!success) {
+ LOG.warn("Timeline server responses with failed refresh");
+ }
+ } catch (Exception e) {
+ // Do not propagate the exception because the server will also do auto
refresh
+ LOG.error("Failed to execute refresh", e);
+ }
+ }
+
+ private <T> T executeRequestToTimelineServerWithRetry(String requestPath,
Map<String, String> queryParameters,
+ TypeReference
reference, RequestMethod method) {
+ int retry = 5;
+ while (--retry >= 0) {
+ long start = System.currentTimeMillis();
+ try {
+ return executeRequestToTimelineServer(requestPath, queryParameters,
reference, method);
+ } catch (IOException e) {
+ LOG.warn("Failed to execute ckp request (" + requestPath + ") to
timeline server", e);
+ } finally {
+ LOG.info("Execute request : (" + requestPath + "), costs: " +
(System.currentTimeMillis() - start) + " ms");
+ }
+ }
+ throw new HoodieException("Failed to execute ckp request (" + requestPath
+ ")");
+ }
+
+ private <T> T executeRequestToTimelineServer(String requestPath, Map<String,
String> queryParameters,
+ TypeReference reference,
RequestMethod method) throws IOException {
+ URIBuilder builder =
Review Comment:
> Can this code be reused?
Sure. Will reuse the code in `TimelineServerBasedWriteMarkers` and add a
new Class `TimelineServerHelper`.
##########
hudi-flink-datasource/hudi-flink/src/main/java/org/apache/hudi/sink/StreamWriteOperatorCoordinator.java:
##########
@@ -349,8 +351,8 @@ private static void
initMetadataTable(HoodieFlinkWriteClient<?> writeClient) {
writeClient.initMetadataTable();
}
- private static CkpMetadata initCkpMetadata(HoodieTableMetaClient metaClient,
Configuration conf) throws IOException {
- CkpMetadata ckpMetadata = CkpMetadata.getInstance(metaClient,
conf.getString(FlinkOptions.WRITE_CLIENT_ID));
+ private static CkpMetadata initCkpMetadata(HoodieTableMetaClient metaClient,
HoodieWriteConfig writeConfig, Configuration conf) throws IOException {
+ CkpMetadata ckpMetadata = CkpMetadataFactory.getCkpMetadata(metaClient,
writeConfig, conf);
ckpMetadata.bootstrap();
return ckpMetadata;
Review Comment:
when `org.apache.hudi.sink.meta.TimelineBasedCkpMetadata#sendRefreshRequest`
is called. And it will be called after start/commit/abort instant.
##########
hudi-common/src/main/java/org/apache/hudi/common/table/timeline/dto/InstantStateDTO.java:
##########
@@ -0,0 +1,68 @@
+/*
+ * 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.hudi.common.table.timeline.dto;
+
+import org.apache.hudi.common.util.ValidationUtils;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.hadoop.fs.FileStatus;
+
+/**
+ * Data transfer object for instant state.
+ *
+ * see org.apache.hudi.sink.meta.CkpMessage.
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class InstantStateDTO {
+
+ /**
+ * Ckp message instant.
+ *
+ * see org.apache.hudi.sink.meta.CkpMessage#instant
Review Comment:
use @see will cause IDE error because we can't find class in the flink
package. Should we just keep it, use @see or delete this line?
--
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: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
