-
Notifications
You must be signed in to change notification settings - Fork 8.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
HADOOP-15262. AliyunOSS: move files under a directory in parallel whe…
…n rename a directory. Contributed by Jinhu Wu.
- Loading branch information
Sammi Chen
committed
Mar 19, 2018
1 parent
86816da
commit d67a5e2
Showing
5 changed files
with
330 additions
and
2 deletions.
There are no files selected for viewing
70 changes: 70 additions & 0 deletions
70
...hadoop-aliyun/src/main/java/org/apache/hadoop/fs/aliyun/oss/AliyunOSSCopyFileContext.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 | ||
* <p/> | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* <p/> | ||
* 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.fs.aliyun.oss; | ||
|
||
import java.util.concurrent.locks.Condition; | ||
import java.util.concurrent.locks.ReentrantLock; | ||
|
||
/** | ||
* Used by {@link AliyunOSSFileSystem} and {@link AliyunOSSCopyFileTask} | ||
* as copy context. It contains some variables used in copy process. | ||
*/ | ||
public class AliyunOSSCopyFileContext { | ||
private final ReentrantLock lock = new ReentrantLock(); | ||
|
||
private Condition readyCondition = lock.newCondition(); | ||
|
||
private boolean copyFailure; | ||
private int copiesFinish; | ||
|
||
public AliyunOSSCopyFileContext() { | ||
copyFailure = false; | ||
copiesFinish = 0; | ||
} | ||
|
||
public void lock() { | ||
lock.lock(); | ||
} | ||
|
||
public void unlock() { | ||
lock.unlock(); | ||
} | ||
|
||
public void awaitAllFinish(int copiesToFinish) throws InterruptedException { | ||
while (this.copiesFinish != copiesToFinish) { | ||
readyCondition.await(); | ||
} | ||
} | ||
|
||
public void signalAll() { | ||
readyCondition.signalAll(); | ||
} | ||
|
||
public boolean isCopyFailure() { | ||
return copyFailure; | ||
} | ||
|
||
public void setCopyFailure(boolean copyFailure) { | ||
this.copyFailure = copyFailure; | ||
} | ||
|
||
public void incCopiesFinish() { | ||
++copiesFinish; | ||
} | ||
} |
65 changes: 65 additions & 0 deletions
65
...ls/hadoop-aliyun/src/main/java/org/apache/hadoop/fs/aliyun/oss/AliyunOSSCopyFileTask.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,65 @@ | ||
/** | ||
* 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 | ||
* <p/> | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* <p/> | ||
* 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.fs.aliyun.oss; | ||
|
||
import org.slf4j.Logger; | ||
import org.slf4j.LoggerFactory; | ||
|
||
/** | ||
* Used by {@link AliyunOSSFileSystem} as an task that submitted | ||
* to the thread pool to accelerate the copy progress. | ||
* Each AliyunOSSCopyFileTask copies one file from src path to dst path | ||
*/ | ||
public class AliyunOSSCopyFileTask implements Runnable { | ||
public static final Logger LOG = | ||
LoggerFactory.getLogger(AliyunOSSCopyFileTask.class); | ||
|
||
private AliyunOSSFileSystemStore store; | ||
private String srcKey; | ||
private String dstKey; | ||
private AliyunOSSCopyFileContext copyFileContext; | ||
|
||
public AliyunOSSCopyFileTask(AliyunOSSFileSystemStore store, | ||
String srcKey, String dstKey, AliyunOSSCopyFileContext copyFileContext) { | ||
this.store = store; | ||
this.srcKey = srcKey; | ||
this.dstKey = dstKey; | ||
this.copyFileContext = copyFileContext; | ||
} | ||
|
||
@Override | ||
public void run() { | ||
boolean fail = false; | ||
try { | ||
store.copyFile(srcKey, dstKey); | ||
} catch (Exception e) { | ||
LOG.warn("Exception thrown when copy from " | ||
+ srcKey + " to " + dstKey + ", exception: " + e); | ||
fail = true; | ||
} finally { | ||
copyFileContext.lock(); | ||
if (fail) { | ||
copyFileContext.setCopyFailure(fail); | ||
} | ||
copyFileContext.incCopiesFinish(); | ||
copyFileContext.signalAll(); | ||
copyFileContext.unlock(); | ||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.