keith-turner commented on code in PR #4059:
URL: https://github.com/apache/accumulo/pull/4059#discussion_r1425510430
##########
server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java:
##########
@@ -1744,18 +1744,41 @@ public void importMapFiles(long tid,
Map<TabletFile,MapFileInfo> fileMap, boolea
// Clients timeout and will think that this operation failed.
// Don't do it if we spent too long waiting for the lock
- long now = System.currentTimeMillis();
+ long now = System.nanoTime();
synchronized (this) {
if (isClosed()) {
throw new IOException("tablet " + extent + " is closed");
}
- // TODO check seems unneeded now - ACCUMULO-1291
- long lockWait = System.currentTimeMillis() - now;
- if (lockWait
- >
getTabletServer().getConfiguration().getTimeInMillis(Property.GENERAL_RPC_TIMEOUT))
{
- throw new IOException(
- "Timeout waiting " + (lockWait / 1000.) + " seconds to get tablet
lock for " + extent);
+ long rpcTimeoutNanos = TimeUnit.MILLISECONDS.toNanos(
+ (long)
(getTabletServer().getConfiguration().getTimeInMillis(Property.GENERAL_RPC_TIMEOUT)
+ * 1.1));
+
+ // wait for any files that are bulk importing up to the RPC timeout limit
+ while (!Collections.disjoint(bulkImporting, fileMap.keySet())) {
+ try {
+ wait(1_000);
+ } catch (InterruptedException e) {
+ Thread.currentThread().interrupt();
+ throw new IllegalStateException(e);
+ }
+
+ long lockWait = System.nanoTime() - now;
+ if (System.nanoTime() - now > rpcTimeoutNanos) {
Review Comment:
```suggestion
if (lockWait > rpcTimeoutNanos) {
```
--
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]
