[GitHub] [hbase] infraio commented on a change in pull request #832: HBASE-23298 Refactor LogRecoveredEditsOutputSink and BoundedLogWriter…
infraio commented on a change in pull request #832: HBASE-23298 Refactor
LogRecoveredEditsOutputSink and BoundedLogWriter…
URL: https://github.com/apache/hbase/pull/832#discussion_r351564158
##
File path:
hbase-server/src/main/java/org/apache/hadoop/hbase/wal/AbstractRecoveredEditsOutputSink.java
##
@@ -0,0 +1,283 @@
+/**
+ * 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.hadoop.hbase.wal;
+
+import static
org.apache.hadoop.hbase.wal.WALSplitUtil.getCompletedRecoveredEditsFilePath;
+import static org.apache.hadoop.hbase.wal.WALSplitUtil.getRegionSplitEditsPath;
+
+import java.io.EOFException;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.hbase.Cell;
+import org.apache.hadoop.hbase.CellUtil;
+import org.apache.hadoop.hbase.HConstants;
+import org.apache.hadoop.hbase.TableName;
+import org.apache.hadoop.hbase.log.HBaseMarkers;
+import org.apache.hadoop.hbase.util.Bytes;
+import org.apache.hadoop.hbase.util.FSUtils;
+import org.apache.hadoop.ipc.RemoteException;
+import org.apache.yetus.audience.InterfaceAudience;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import org.apache.hbase.thirdparty.org.apache.commons.collections4.MapUtils;
+
+@InterfaceAudience.Private
+public abstract class AbstractRecoveredEditsOutputSink extends OutputSink {
+ private static final Logger LOG =
LoggerFactory.getLogger(RecoveredEditsOutputSink.class);
+ private WALSplitter walSplitter;
+ private FileSystem walFS;
+ private Configuration conf;
+ private final ConcurrentMap regionMaximumEditLogSeqNum = new
ConcurrentHashMap<>();
+
+ public AbstractRecoveredEditsOutputSink(WALSplitter walSplitter,
+ WALSplitter.PipelineController controller, EntryBuffers entryBuffers,
int numWriters) {
+super(controller, entryBuffers, numWriters);
+this.walSplitter = walSplitter;
+this.walFS = walSplitter.walFS;
+this.conf = walSplitter.conf;
+ }
+
+ /**
+ * @return a writer that wraps a {@link WALProvider.Writer} and its Path.
Caller should close.
+ */
+ protected RecoveredEditsWriter createWriter(TableName tableName, byte[]
region, long seqId)
+ throws IOException {
+// If we already decided that this region doesn't get any output
+// we don't need to check again.
+if (blacklistedRegions.contains(region)) {
Review comment:
Let me remove blacklistedRegions stuff.
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.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
[GitHub] [hbase] infraio commented on a change in pull request #832: HBASE-23298 Refactor LogRecoveredEditsOutputSink and BoundedLogWriter…
infraio commented on a change in pull request #832: HBASE-23298 Refactor
LogRecoveredEditsOutputSink and BoundedLogWriter…
URL: https://github.com/apache/hbase/pull/832#discussion_r351563972
##
File path:
hbase-server/src/main/java/org/apache/hadoop/hbase/wal/AbstractRecoveredEditsOutputSink.java
##
@@ -0,0 +1,283 @@
+/**
+ * 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.hadoop.hbase.wal;
+
+import static
org.apache.hadoop.hbase.wal.WALSplitUtil.getCompletedRecoveredEditsFilePath;
+import static org.apache.hadoop.hbase.wal.WALSplitUtil.getRegionSplitEditsPath;
+
+import java.io.EOFException;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.hbase.Cell;
+import org.apache.hadoop.hbase.CellUtil;
+import org.apache.hadoop.hbase.HConstants;
+import org.apache.hadoop.hbase.TableName;
+import org.apache.hadoop.hbase.log.HBaseMarkers;
+import org.apache.hadoop.hbase.util.Bytes;
+import org.apache.hadoop.hbase.util.FSUtils;
+import org.apache.hadoop.ipc.RemoteException;
+import org.apache.yetus.audience.InterfaceAudience;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import org.apache.hbase.thirdparty.org.apache.commons.collections4.MapUtils;
+
+@InterfaceAudience.Private
+public abstract class AbstractRecoveredEditsOutputSink extends OutputSink {
+ private static final Logger LOG =
LoggerFactory.getLogger(RecoveredEditsOutputSink.class);
+ private WALSplitter walSplitter;
+ private FileSystem walFS;
+ private Configuration conf;
+ private final ConcurrentMap regionMaximumEditLogSeqNum = new
ConcurrentHashMap<>();
+
+ public AbstractRecoveredEditsOutputSink(WALSplitter walSplitter,
+ WALSplitter.PipelineController controller, EntryBuffers entryBuffers,
int numWriters) {
+super(controller, entryBuffers, numWriters);
+this.walSplitter = walSplitter;
+this.walFS = walSplitter.walFS;
+this.conf = walSplitter.conf;
+ }
+
+ /**
+ * @return a writer that wraps a {@link WALProvider.Writer} and its Path.
Caller should close.
+ */
+ protected RecoveredEditsWriter createWriter(TableName tableName, byte[]
region, long seqId)
+ throws IOException {
+// If we already decided that this region doesn't get any output
+// we don't need to check again.
+if (blacklistedRegions.contains(region)) {
+ return null;
+}
+String tmpDirName = walSplitter.conf
+.get(HConstants.TEMPORARY_FS_DIRECTORY_KEY,
HConstants.DEFAULT_TEMPORARY_HDFS_DIRECTORY);
+Path regionEditsPath = getRegionSplitEditsPath(tableName, region, seqId,
+walSplitter.getFileBeingSplit().getPath().getName(), tmpDirName, conf);
+if (regionEditsPath == null) {
+ blacklistedRegions.add(region);
+ return null;
+}
+FileSystem walFs = FSUtils.getWALFileSystem(conf);
+if (walFs.exists(regionEditsPath)) {
+ LOG.warn("Found old edits file. It could be the " +
+ "result of a previous failed split attempt. Deleting " +
regionEditsPath + ", length=" +
+ walFs.getFileStatus(regionEditsPath).getLen());
+ if (!walFs.delete(regionEditsPath, false)) {
+LOG.warn("Failed delete of old {}", regionEditsPath);
+ }
+}
+WALProvider.Writer w = walSplitter.createWriter(regionEditsPath);
+LOG.info("Creating recovered edits writer path={}", regionEditsPath);
+return new RecoveredEditsWriter(regionEditsPath, w, seqId);
+ }
+
+ protected Path closeWriter(String encodedRegionName, RecoveredEditsWriter
wap,
+ List thrown) throws IOException {
+try {
+ wap.writer.close();
+} catch (IOException ioe) {
+ LOG.error("Could not close recovered edits at {}", wap.path, ioe);
+ thrown.add(ioe);
+ return null;
+}
+LOG.info("Closed recovered edits writer path={} (wrote {} edits, skipped
{} edits in {} ms",
+wap.path, wap.editsWritten, wap.editsSkipped, wap.nanosSpent / 1000 /
1000);
+
[GitHub] [hbase] infraio commented on a change in pull request #832: HBASE-23298 Refactor LogRecoveredEditsOutputSink and BoundedLogWriter…
infraio commented on a change in pull request #832: HBASE-23298 Refactor
LogRecoveredEditsOutputSink and BoundedLogWriter…
URL: https://github.com/apache/hbase/pull/832#discussion_r351563266
##
File path:
hbase-server/src/main/java/org/apache/hadoop/hbase/wal/AbstractRecoveredEditsOutputSink.java
##
@@ -0,0 +1,283 @@
+/**
+ * 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.hadoop.hbase.wal;
+
+import static
org.apache.hadoop.hbase.wal.WALSplitUtil.getCompletedRecoveredEditsFilePath;
+import static org.apache.hadoop.hbase.wal.WALSplitUtil.getRegionSplitEditsPath;
+
+import java.io.EOFException;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.hbase.Cell;
+import org.apache.hadoop.hbase.CellUtil;
+import org.apache.hadoop.hbase.HConstants;
+import org.apache.hadoop.hbase.TableName;
+import org.apache.hadoop.hbase.log.HBaseMarkers;
+import org.apache.hadoop.hbase.util.Bytes;
+import org.apache.hadoop.hbase.util.FSUtils;
+import org.apache.hadoop.ipc.RemoteException;
+import org.apache.yetus.audience.InterfaceAudience;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import org.apache.hbase.thirdparty.org.apache.commons.collections4.MapUtils;
+
+@InterfaceAudience.Private
+public abstract class AbstractRecoveredEditsOutputSink extends OutputSink {
+ private static final Logger LOG =
LoggerFactory.getLogger(RecoveredEditsOutputSink.class);
+ private WALSplitter walSplitter;
+ private FileSystem walFS;
+ private Configuration conf;
+ private final ConcurrentMap regionMaximumEditLogSeqNum = new
ConcurrentHashMap<>();
+
+ public AbstractRecoveredEditsOutputSink(WALSplitter walSplitter,
+ WALSplitter.PipelineController controller, EntryBuffers entryBuffers,
int numWriters) {
+super(controller, entryBuffers, numWriters);
+this.walSplitter = walSplitter;
+this.walFS = walSplitter.walFS;
+this.conf = walSplitter.conf;
+ }
+
+ /**
+ * @return a writer that wraps a {@link WALProvider.Writer} and its Path.
Caller should close.
+ */
+ protected RecoveredEditsWriter createWriter(TableName tableName, byte[]
region, long seqId)
+ throws IOException {
+// If we already decided that this region doesn't get any output
+// we don't need to check again.
+if (blacklistedRegions.contains(region)) {
+ return null;
+}
+String tmpDirName = walSplitter.conf
+.get(HConstants.TEMPORARY_FS_DIRECTORY_KEY,
HConstants.DEFAULT_TEMPORARY_HDFS_DIRECTORY);
+Path regionEditsPath = getRegionSplitEditsPath(tableName, region, seqId,
+walSplitter.getFileBeingSplit().getPath().getName(), tmpDirName, conf);
+if (regionEditsPath == null) {
+ blacklistedRegions.add(region);
+ return null;
+}
Review comment:
I thought it should belong here. It is a part of createRecoveredEditsWriter.
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.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
[GitHub] [hbase] infraio commented on a change in pull request #832: HBASE-23298 Refactor LogRecoveredEditsOutputSink and BoundedLogWriter…
infraio commented on a change in pull request #832: HBASE-23298 Refactor
LogRecoveredEditsOutputSink and BoundedLogWriter…
URL: https://github.com/apache/hbase/pull/832#discussion_r351562923
##
File path:
hbase-server/src/main/java/org/apache/hadoop/hbase/wal/AbstractRecoveredEditsOutputSink.java
##
@@ -0,0 +1,283 @@
+/**
+ * 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.hadoop.hbase.wal;
+
+import static
org.apache.hadoop.hbase.wal.WALSplitUtil.getCompletedRecoveredEditsFilePath;
+import static org.apache.hadoop.hbase.wal.WALSplitUtil.getRegionSplitEditsPath;
+
+import java.io.EOFException;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.hbase.Cell;
+import org.apache.hadoop.hbase.CellUtil;
+import org.apache.hadoop.hbase.HConstants;
+import org.apache.hadoop.hbase.TableName;
+import org.apache.hadoop.hbase.log.HBaseMarkers;
+import org.apache.hadoop.hbase.util.Bytes;
+import org.apache.hadoop.hbase.util.FSUtils;
+import org.apache.hadoop.ipc.RemoteException;
+import org.apache.yetus.audience.InterfaceAudience;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import org.apache.hbase.thirdparty.org.apache.commons.collections4.MapUtils;
+
+@InterfaceAudience.Private
+public abstract class AbstractRecoveredEditsOutputSink extends OutputSink {
+ private static final Logger LOG =
LoggerFactory.getLogger(RecoveredEditsOutputSink.class);
+ private WALSplitter walSplitter;
+ private FileSystem walFS;
+ private Configuration conf;
+ private final ConcurrentMap regionMaximumEditLogSeqNum = new
ConcurrentHashMap<>();
+
+ public AbstractRecoveredEditsOutputSink(WALSplitter walSplitter,
+ WALSplitter.PipelineController controller, EntryBuffers entryBuffers,
int numWriters) {
+super(controller, entryBuffers, numWriters);
+this.walSplitter = walSplitter;
+this.walFS = walSplitter.walFS;
+this.conf = walSplitter.conf;
+ }
+
+ /**
+ * @return a writer that wraps a {@link WALProvider.Writer} and its Path.
Caller should close.
+ */
+ protected RecoveredEditsWriter createWriter(TableName tableName, byte[]
region, long seqId)
+ throws IOException {
+// If we already decided that this region doesn't get any output
+// we don't need to check again.
+if (blacklistedRegions.contains(region)) {
Review comment:
Checked the code. regionEditsPath cannot be null now. So there will no
regions which can be added to blacklistedRegions...
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.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
[GitHub] [hbase] infraio commented on a change in pull request #832: HBASE-23298 Refactor LogRecoveredEditsOutputSink and BoundedLogWriter…
infraio commented on a change in pull request #832: HBASE-23298 Refactor LogRecoveredEditsOutputSink and BoundedLogWriter… URL: https://github.com/apache/hbase/pull/832#discussion_r351561400 ## File path: hbase-server/src/main/java/org/apache/hadoop/hbase/wal/AbstractRecoveredEditsOutputSink.java ## @@ -0,0 +1,283 @@ +/** + * 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.hadoop.hbase.wal; + +import static org.apache.hadoop.hbase.wal.WALSplitUtil.getCompletedRecoveredEditsFilePath; +import static org.apache.hadoop.hbase.wal.WALSplitUtil.getRegionSplitEditsPath; + +import java.io.EOFException; +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentMap; + +import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.fs.FileSystem; +import org.apache.hadoop.fs.Path; +import org.apache.hadoop.hbase.Cell; +import org.apache.hadoop.hbase.CellUtil; +import org.apache.hadoop.hbase.HConstants; +import org.apache.hadoop.hbase.TableName; +import org.apache.hadoop.hbase.log.HBaseMarkers; Review comment: HBaseMarkers.FATAL was used in many palces. Maybe a new issue? 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. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [hbase] infraio commented on a change in pull request #832: HBASE-23298 Refactor LogRecoveredEditsOutputSink and BoundedLogWriter…
infraio commented on a change in pull request #832: HBASE-23298 Refactor LogRecoveredEditsOutputSink and BoundedLogWriter… URL: https://github.com/apache/hbase/pull/832#discussion_r351561014 ## File path: hbase-server/src/main/java/org/apache/hadoop/hbase/wal/AbstractRecoveredEditsOutputSink.java ## @@ -0,0 +1,283 @@ +/** + * 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.hadoop.hbase.wal; + +import static org.apache.hadoop.hbase.wal.WALSplitUtil.getCompletedRecoveredEditsFilePath; +import static org.apache.hadoop.hbase.wal.WALSplitUtil.getRegionSplitEditsPath; + +import java.io.EOFException; +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentMap; Review comment: The Map was used in other methods. See line 251. 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. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [hbase] infraio commented on a change in pull request #832: HBASE-23298 Refactor LogRecoveredEditsOutputSink and BoundedLogWriter…
infraio commented on a change in pull request #832: HBASE-23298 Refactor
LogRecoveredEditsOutputSink and BoundedLogWriter…
URL: https://github.com/apache/hbase/pull/832#discussion_r351056336
##
File path:
hbase-server/src/main/java/org/apache/hadoop/hbase/wal/AbstractRecoveredEditsOutputSink.java
##
@@ -0,0 +1,283 @@
+/**
+ * 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.hadoop.hbase.wal;
+
+import static
org.apache.hadoop.hbase.wal.WALSplitUtil.getCompletedRecoveredEditsFilePath;
+import static org.apache.hadoop.hbase.wal.WALSplitUtil.getRegionSplitEditsPath;
+
+import java.io.EOFException;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.hbase.Cell;
+import org.apache.hadoop.hbase.CellUtil;
+import org.apache.hadoop.hbase.HConstants;
+import org.apache.hadoop.hbase.TableName;
+import org.apache.hadoop.hbase.log.HBaseMarkers;
+import org.apache.hadoop.hbase.util.Bytes;
+import org.apache.hadoop.hbase.util.FSUtils;
+import org.apache.hadoop.ipc.RemoteException;
+import org.apache.yetus.audience.InterfaceAudience;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import org.apache.hbase.thirdparty.org.apache.commons.collections4.MapUtils;
+
+@InterfaceAudience.Private
+public abstract class AbstractRecoveredEditsOutputSink extends OutputSink {
Review comment:
It only was used in WAL split now. The two tiers abstract's reasons is there
will be a RecoveredHFilesOutPutSink in the future. See HBASE-23286.
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.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
[GitHub] [hbase] infraio commented on a change in pull request #832: HBASE-23298 Refactor LogRecoveredEditsOutputSink and BoundedLogWriter…
infraio commented on a change in pull request #832: HBASE-23298 Refactor
LogRecoveredEditsOutputSink and BoundedLogWriter…
URL: https://github.com/apache/hbase/pull/832#discussion_r347177698
##
File path:
hbase-server/src/main/java/org/apache/hadoop/hbase/wal/BaseRecoveredEditsOutputSink.java
##
@@ -0,0 +1,281 @@
+/**
+ * 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.hadoop.hbase.wal;
+
+import static
org.apache.hadoop.hbase.wal.WALSplitUtil.getCompletedRecoveredEditsFilePath;
+import static org.apache.hadoop.hbase.wal.WALSplitUtil.getRegionSplitEditsPath;
+
+import java.io.EOFException;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.hbase.Cell;
+import org.apache.hadoop.hbase.CellUtil;
+import org.apache.hadoop.hbase.HConstants;
+import org.apache.hadoop.hbase.log.HBaseMarkers;
+import org.apache.hadoop.hbase.util.Bytes;
+import org.apache.hadoop.hbase.util.FSUtils;
+import org.apache.hadoop.ipc.RemoteException;
+import org.apache.yetus.audience.InterfaceAudience;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import org.apache.hbase.thirdparty.org.apache.commons.collections4.MapUtils;
+
+@InterfaceAudience.Private
+public abstract class BaseRecoveredEditsOutputSink extends OutputSink {
+ private static final Logger LOG =
LoggerFactory.getLogger(RecoveredEditsOutputSink.class);
+ private WALSplitter walSplitter;
+ private FileSystem walFS;
+ private Configuration conf;
+ private final ConcurrentHashMap regionMaximumEditLogSeqNum =
+ new ConcurrentHashMap<>();
+
+ public BaseRecoveredEditsOutputSink(WALSplitter walSplitter,
+ WALSplitter.PipelineController controller, EntryBuffers entryBuffers,
int numWriters) {
+super(controller, entryBuffers, numWriters);
+this.walSplitter = walSplitter;
+this.walFS = walSplitter.walFS;
+this.conf = walSplitter.conf;
+ }
+
+ /**
+ * @return a path with a write for that path. caller should close.
+ */
+ protected RecoveredEditsWriter createWriter(byte[] region, WAL.Entry entry)
throws IOException {
Review comment:
Will change to pass the tablename, regionname, and the sequenceid.
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.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
[GitHub] [hbase] infraio commented on a change in pull request #832: HBASE-23298 Refactor LogRecoveredEditsOutputSink and BoundedLogWriter…
infraio commented on a change in pull request #832: HBASE-23298 Refactor
LogRecoveredEditsOutputSink and BoundedLogWriter…
URL: https://github.com/apache/hbase/pull/832#discussion_r347177615
##
File path:
hbase-server/src/main/java/org/apache/hadoop/hbase/wal/BoundedEntryBuffers.java
##
@@ -0,0 +1,40 @@
+/**
+ * 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.hadoop.hbase.wal;
+
+import org.apache.yetus.audience.InterfaceAudience;
+
+@InterfaceAudience.Private
+public class BoundedEntryBuffers extends EntryBuffers {
Review comment:
Ok.
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.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
[GitHub] [hbase] infraio commented on a change in pull request #832: HBASE-23298 Refactor LogRecoveredEditsOutputSink and BoundedLogWriter…
infraio commented on a change in pull request #832: HBASE-23298 Refactor
LogRecoveredEditsOutputSink and BoundedLogWriter…
URL: https://github.com/apache/hbase/pull/832#discussion_r347177592
##
File path:
hbase-server/src/main/java/org/apache/hadoop/hbase/wal/BaseRecoveredEditsOutputSink.java
##
@@ -0,0 +1,281 @@
+/**
+ * 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.hadoop.hbase.wal;
+
+import static
org.apache.hadoop.hbase.wal.WALSplitUtil.getCompletedRecoveredEditsFilePath;
+import static org.apache.hadoop.hbase.wal.WALSplitUtil.getRegionSplitEditsPath;
+
+import java.io.EOFException;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.hbase.Cell;
+import org.apache.hadoop.hbase.CellUtil;
+import org.apache.hadoop.hbase.HConstants;
+import org.apache.hadoop.hbase.log.HBaseMarkers;
+import org.apache.hadoop.hbase.util.Bytes;
+import org.apache.hadoop.hbase.util.FSUtils;
+import org.apache.hadoop.ipc.RemoteException;
+import org.apache.yetus.audience.InterfaceAudience;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import org.apache.hbase.thirdparty.org.apache.commons.collections4.MapUtils;
+
+@InterfaceAudience.Private
+public abstract class BaseRecoveredEditsOutputSink extends OutputSink {
+ private static final Logger LOG =
LoggerFactory.getLogger(RecoveredEditsOutputSink.class);
+ private WALSplitter walSplitter;
+ private FileSystem walFS;
+ private Configuration conf;
+ private final ConcurrentHashMap regionMaximumEditLogSeqNum =
+ new ConcurrentHashMap<>();
+
+ public BaseRecoveredEditsOutputSink(WALSplitter walSplitter,
+ WALSplitter.PipelineController controller, EntryBuffers entryBuffers,
int numWriters) {
+super(controller, entryBuffers, numWriters);
+this.walSplitter = walSplitter;
+this.walFS = walSplitter.walFS;
+this.conf = walSplitter.conf;
+ }
+
+ /**
+ * @return a path with a write for that path. caller should close.
+ */
+ protected RecoveredEditsWriter createWriter(byte[] region, WAL.Entry entry)
throws IOException {
+// If we already decided that this region doesn't get any output
+// we don't need to check again.
+if (blacklistedRegions.contains(region)) {
+ return null;
+}
+String tmpDirName =
walSplitter.conf.get(HConstants.TEMPORARY_FS_DIRECTORY_KEY,
+HConstants.DEFAULT_TEMPORARY_HDFS_DIRECTORY);
+Path regionedits = getRegionSplitEditsPath(entry,
+walSplitter.getFileBeingSplit().getPath().getName(), tmpDirName, conf);
+if (regionedits == null) {
+ blacklistedRegions.add(region);
+ return null;
+}
+FileSystem walFs = FSUtils.getWALFileSystem(conf);
+if (walFs.exists(regionedits)) {
+ LOG.warn("Found old edits file. It could be the "
+ + "result of a previous failed split attempt. Deleting " +
regionedits + ", length="
+ + walFs.getFileStatus(regionedits).getLen());
+ if (!walFs.delete(regionedits, false)) {
+LOG.warn("Failed delete of old {}", regionedits);
+ }
+}
+WALProvider.Writer w = walSplitter.createWriter(regionedits);
+LOG.info("Creating recovered edits writer path={}", regionedits);
+return new RecoveredEditsWriter(regionedits, w,
entry.getKey().getSequenceId());
+ }
+
+ protected Path closeWriter(String encodedRegionName, RecoveredEditsWriter
wap,
+ List thrown) throws IOException {
+try {
+ wap.writer.close();
+} catch (IOException ioe) {
+ LOG.error("Could not close recovered edits at {}", wap.path, ioe);
+ thrown.add(ioe);
+ return null;
+}
+LOG.info("Closed recovered edits writer path={} (wrote {} edits, skipped
{} edits in {} ms",
+wap.path, wap.editsWritten, wap.editsSkipped, wap.nanosSpent / 1000 /
1000);
+if (wap.editsWritten == 0) {
+ // just remove the empty recovered.edits file
+ if (walFS.exists(wap.path) && !walFS.delete(wap.path, false)) {
+
