-
Notifications
You must be signed in to change notification settings - Fork 2.5k
[HUDI-4065] Add FileBasedLockProvider #6071
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
Changes from 14 commits
be4aeae
02d8da9
eb14274
c281194
7f4c141
06ea24c
4885c98
179dc04
8a533e8
ee3559c
e2eca01
25ea8db
424c1da
b12f205
b57aab2
63568d7
cae68ae
4dca5ab
4766951
d5254f4
68c8625
8fce774
ef58952
5fa8809
4d68900
35d61e0
be5e2b1
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 |
|---|---|---|
| @@ -0,0 +1,159 @@ | ||
| /* | ||
| * 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.client.transaction.lock; | ||
|
|
||
| import org.apache.hadoop.conf.Configuration; | ||
| import org.apache.hadoop.fs.FileSystem; | ||
| import org.apache.hadoop.fs.Path; | ||
| import org.apache.hudi.common.config.LockConfiguration; | ||
| import org.apache.hudi.common.fs.FSUtils; | ||
| import org.apache.hudi.common.lock.LockProvider; | ||
| import org.apache.hudi.common.lock.LockState; | ||
| import org.apache.hudi.common.util.StringUtils; | ||
| import org.apache.hudi.common.util.ValidationUtils; | ||
| import org.apache.hudi.exception.HoodieIOException; | ||
| import org.apache.hudi.exception.HoodieLockException; | ||
| import org.apache.log4j.LogManager; | ||
| import org.apache.log4j.Logger; | ||
|
|
||
| import java.io.IOException; | ||
| import java.io.Serializable; | ||
| import java.util.concurrent.TimeUnit; | ||
|
|
||
| import static org.apache.hudi.common.config.LockConfiguration.FILESYSTEM_LOCK_EXPIRE_PROP_KEY; | ||
| import static org.apache.hudi.common.config.LockConfiguration.FILESYSTEM_LOCK_PATH_PROP_KEY; | ||
| import static org.apache.hudi.common.config.LockConfiguration.LOCK_ACQUIRE_NUM_RETRIES_PROP_KEY; | ||
| import static org.apache.hudi.common.config.LockConfiguration.LOCK_ACQUIRE_RETRY_WAIT_TIME_IN_MILLIS_PROP_KEY; | ||
|
|
||
| /** | ||
| * A FileSystem based lock. This {@link LockProvider} implementation allows to lock table operations | ||
| * using DFS. Users might need to manually clean the Locker's path if writeClient crash and never run again. | ||
| * NOTE: This only works for DFS with atomic create/delete operation | ||
| */ | ||
| public class FileBasedLockProvider implements LockProvider<String>, Serializable { | ||
|
|
||
| private static final Logger LOG = LogManager.getLogger(FileBasedLockProvider.class); | ||
|
|
||
| private static final String LOCK = "lock"; | ||
fengjian428 marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
|
|
||
| private final int retryMaxCount; | ||
| private final int retryWaitTimeMs; | ||
| private final int lockTimeoutMinutes; | ||
| private transient FileSystem fs; | ||
| private transient Path lockFile; | ||
| protected LockConfiguration lockConfiguration; | ||
|
|
||
| public FileBasedLockProvider(final LockConfiguration lockConfiguration, final Configuration configuration) { | ||
| checkRequiredProps(lockConfiguration); | ||
| this.lockConfiguration = lockConfiguration; | ||
| final String lockDirectory = lockConfiguration.getConfig().getString(FILESYSTEM_LOCK_PATH_PROP_KEY); | ||
| this.retryWaitTimeMs = lockConfiguration.getConfig().getInteger(LOCK_ACQUIRE_RETRY_WAIT_TIME_IN_MILLIS_PROP_KEY); | ||
| this.retryMaxCount = lockConfiguration.getConfig().getInteger(LOCK_ACQUIRE_NUM_RETRIES_PROP_KEY); | ||
| this.lockTimeoutMinutes = lockConfiguration.getConfig().getInteger(FILESYSTEM_LOCK_EXPIRE_PROP_KEY); | ||
| this.lockFile = new Path(lockDirectory + "/" + LOCK); | ||
fengjian428 marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| this.fs = FSUtils.getFs(this.lockFile.toString(), configuration); | ||
| } | ||
|
|
||
| @Override | ||
| public void close() { | ||
| synchronized (LOCK) { | ||
| try { | ||
| fs.delete(this.lockFile, true); | ||
| } catch (IOException e) { | ||
| throw new HoodieLockException(generateLogStatement(LockState.FAILED_TO_RELEASE), e); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public boolean tryLock(long time, TimeUnit unit) { | ||
| try { | ||
| int numRetries = 0; | ||
| synchronized (LOCK) { | ||
| while (fs.exists(this.lockFile)) { | ||
| LOCK.wait(retryWaitTimeMs); | ||
| numRetries++; | ||
| if (numRetries > retryMaxCount) { | ||
| return false; | ||
| } | ||
| // Check whether lock is already expired or not, if so try to delete lock file | ||
| if (lockTimeoutMinutes != 0 && checkIfExpired()) { | ||
| if (fs.delete(this.lockFile, true)) { | ||
| break; | ||
| } | ||
| } | ||
| } | ||
| acquireLock(); | ||
| return fs.exists(this.lockFile); | ||
| } | ||
| } catch (IOException | InterruptedException e) { | ||
| throw new HoodieLockException(generateLogStatement(LockState.FAILED_TO_ACQUIRE), e); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public void unlock() { | ||
| synchronized (LOCK) { | ||
| try { | ||
| if (fs.exists(this.lockFile)) { | ||
| fs.delete(this.lockFile, true); | ||
| } | ||
| } catch (IOException io) { | ||
| throw new HoodieIOException(generateLogStatement(LockState.FAILED_TO_RELEASE), io); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public String getLock() { | ||
| return this.lockFile.toString(); | ||
| } | ||
|
|
||
| private boolean checkIfExpired() { | ||
| try { | ||
| long modificationTime = fs.getFileStatus(this.lockFile).getModificationTime(); | ||
| if (System.currentTimeMillis() - modificationTime > lockTimeoutMinutes * 60 * 1000) { | ||
| return true; | ||
| } | ||
| } catch (IOException e) { | ||
| LOG.error(generateLogStatement(LockState.ALREADY_RELEASED) + " failed to get lockFile's modification time", e); | ||
| } | ||
| return false; | ||
| } | ||
|
|
||
| private void acquireLock() { | ||
| try { | ||
| fs.create(this.lockFile, false).close(); | ||
| } catch (IOException e) { | ||
| throw new HoodieIOException(generateLogStatement(LockState.FAILED_TO_ACQUIRE), e); | ||
| } | ||
| } | ||
|
|
||
| protected String generateLogStatement(LockState state) { | ||
| return StringUtils.join(state.name(), " lock at", getLock()); | ||
fengjian428 marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| } | ||
|
|
||
| private void checkRequiredProps(final LockConfiguration config) { | ||
| ValidationUtils.checkArgument(config.getConfig().getString(FILESYSTEM_LOCK_PATH_PROP_KEY) != null); | ||
| ValidationUtils.checkArgument(config.getConfig().getInteger(LOCK_ACQUIRE_RETRY_WAIT_TIME_IN_MILLIS_PROP_KEY) > 0); | ||
| ValidationUtils.checkArgument(config.getConfig().getInteger(LOCK_ACQUIRE_NUM_RETRIES_PROP_KEY) > 0); | ||
| ValidationUtils.checkArgument(config.getConfig().getInteger(FILESYSTEM_LOCK_EXPIRE_PROP_KEY) >= 0); | ||
| } | ||
| } | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,103 @@ | ||
| /* | ||
| * 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.client.transaction; | ||
|
|
||
| import org.apache.hadoop.conf.Configuration; | ||
| import org.apache.hadoop.hdfs.MiniDFSCluster; | ||
| import org.apache.hudi.client.transaction.lock.FileBasedLockProvider; | ||
| import org.apache.hudi.common.config.LockConfiguration; | ||
| import org.apache.hudi.common.testutils.minicluster.HdfsTestService; | ||
| import org.apache.hudi.exception.HoodieLockException; | ||
| import org.apache.log4j.LogManager; | ||
| import org.apache.log4j.Logger; | ||
| import org.junit.jupiter.api.Assertions; | ||
| import org.junit.jupiter.api.BeforeAll; | ||
| import org.junit.jupiter.api.Test; | ||
|
|
||
| import java.io.IOException; | ||
| import java.util.Properties; | ||
| import java.util.concurrent.TimeUnit; | ||
|
|
||
| import static org.apache.hudi.common.config.LockConfiguration.FILESYSTEM_LOCK_EXPIRE_PROP_KEY; | ||
| import static org.apache.hudi.common.config.LockConfiguration.FILESYSTEM_LOCK_PATH_PROP_KEY; | ||
| import static org.apache.hudi.common.config.LockConfiguration.LOCK_ACQUIRE_NUM_RETRIES_PROP_KEY; | ||
| import static org.apache.hudi.common.config.LockConfiguration.LOCK_ACQUIRE_WAIT_TIMEOUT_MS_PROP_KEY; | ||
|
|
||
| public class TestFileBasedLockProvider { | ||
| private static final Logger LOG = LogManager.getLogger(TestFileBasedLockProvider.class); | ||
| private static HdfsTestService hdfsTestService; | ||
| private static MiniDFSCluster dfsCluster; | ||
| private static LockConfiguration lockConfiguration; | ||
| private static Configuration hadoopConf; | ||
|
|
||
| @BeforeAll | ||
| public static void setup() throws IOException { | ||
| hdfsTestService = new HdfsTestService(); | ||
| dfsCluster = hdfsTestService.start(true); | ||
fengjian428 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| hadoopConf = dfsCluster.getFileSystem().getConf(); | ||
|
|
||
| Properties properties = new Properties(); | ||
| properties.setProperty(FILESYSTEM_LOCK_PATH_PROP_KEY, "/tmp/"); | ||
| properties.setProperty(FILESYSTEM_LOCK_EXPIRE_PROP_KEY, "1"); | ||
| properties.setProperty(LOCK_ACQUIRE_WAIT_TIMEOUT_MS_PROP_KEY, "1000"); | ||
| properties.setProperty(LOCK_ACQUIRE_NUM_RETRIES_PROP_KEY, "3"); | ||
| lockConfiguration = new LockConfiguration(properties); | ||
| } | ||
|
|
||
| @Test | ||
| public void testAcquireLock() { | ||
| FileBasedLockProvider fileBasedLockProvider = new FileBasedLockProvider(lockConfiguration, hadoopConf); | ||
| Assertions.assertTrue(fileBasedLockProvider.tryLock(lockConfiguration.getConfig() | ||
| .getLong(LOCK_ACQUIRE_WAIT_TIMEOUT_MS_PROP_KEY), TimeUnit.MILLISECONDS)); | ||
| fileBasedLockProvider.unlock(); | ||
| } | ||
|
|
||
| @Test | ||
| public void testUnLock() { | ||
| FileBasedLockProvider fileBasedLockProvider = new FileBasedLockProvider(lockConfiguration, hadoopConf); | ||
| Assertions.assertTrue(fileBasedLockProvider.tryLock(lockConfiguration.getConfig() | ||
| .getLong(LOCK_ACQUIRE_WAIT_TIMEOUT_MS_PROP_KEY), TimeUnit.MILLISECONDS)); | ||
| fileBasedLockProvider.unlock(); | ||
| fileBasedLockProvider.tryLock(lockConfiguration.getConfig() | ||
fengjian428 marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| .getLong(LOCK_ACQUIRE_WAIT_TIMEOUT_MS_PROP_KEY), TimeUnit.MILLISECONDS); | ||
| } | ||
|
|
||
| @Test | ||
| public void testReentrantLock() { | ||
| FileBasedLockProvider fileBasedLockProvider = new FileBasedLockProvider(lockConfiguration, hadoopConf); | ||
| Assertions.assertTrue(fileBasedLockProvider.tryLock(lockConfiguration.getConfig() | ||
| .getLong(LOCK_ACQUIRE_WAIT_TIMEOUT_MS_PROP_KEY), TimeUnit.MILLISECONDS)); | ||
| try { | ||
| fileBasedLockProvider.tryLock(lockConfiguration.getConfig() | ||
| .getLong(LOCK_ACQUIRE_WAIT_TIMEOUT_MS_PROP_KEY), TimeUnit.MILLISECONDS); | ||
| Assertions.fail(); | ||
| } catch (HoodieLockException e) { | ||
| // expected | ||
| } | ||
| fileBasedLockProvider.unlock(); | ||
| } | ||
|
|
||
| @Test | ||
| public void testUnlockWithoutLock() { | ||
| FileBasedLockProvider fileBasedLockProvider = new FileBasedLockProvider(lockConfiguration, hadoopConf); | ||
| fileBasedLockProvider.unlock(); | ||
| } | ||
|
Contributor
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. What's the mechanism of measure for this test case?
Contributor
Author
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. Just test if can unlock without lock and no exception throws
Contributor
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.
If you want to judge an exception, you may add a try-catch block and assertion.
IMO, I see
Contributor
Author
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. Still got conflict error. hudi-common ok hudi-client-common cannot
Contributor
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. yeah, if move to
Contributor
Author
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. refactored TestHoodieClientMultiWriter to test FileSystemBasedLockProvider in it |
||
|
|
||
| } | ||
Uh oh!
There was an error while loading. Please reload this page.