rdblue commented on a change in pull request #1823: URL: https://github.com/apache/iceberg/pull/1823#discussion_r547511642
########## File path: aws/src/main/java/org/apache/iceberg/aws/glue/DynamoLockManager.java ########## @@ -0,0 +1,190 @@ +/* + * 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.iceberg.aws.glue; + +import java.util.List; +import java.util.Map; +import org.apache.iceberg.aws.AwsProperties; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; +import org.apache.iceberg.relocated.com.google.common.collect.Maps; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import software.amazon.awssdk.services.dynamodb.DynamoDbClient; +import software.amazon.awssdk.services.dynamodb.model.AttributeDefinition; +import software.amazon.awssdk.services.dynamodb.model.AttributeValue; +import software.amazon.awssdk.services.dynamodb.model.BillingMode; +import software.amazon.awssdk.services.dynamodb.model.ConditionalCheckFailedException; +import software.amazon.awssdk.services.dynamodb.model.CreateTableRequest; +import software.amazon.awssdk.services.dynamodb.model.DeleteItemRequest; +import software.amazon.awssdk.services.dynamodb.model.DescribeTableRequest; +import software.amazon.awssdk.services.dynamodb.model.DescribeTableResponse; +import software.amazon.awssdk.services.dynamodb.model.KeySchemaElement; +import software.amazon.awssdk.services.dynamodb.model.KeyType; +import software.amazon.awssdk.services.dynamodb.model.PutItemRequest; +import software.amazon.awssdk.services.dynamodb.model.ResourceNotFoundException; +import software.amazon.awssdk.services.dynamodb.model.ScalarAttributeType; +import software.amazon.awssdk.services.dynamodb.model.TableStatus; + +/** + * DynamoDB implementation for the lock manager. + */ +class DynamoLockManager implements LockManager { + + private static final Logger LOG = LoggerFactory.getLogger(DynamoLockManager.class); + + private static final String LOCK_TABLE_COL_LOCK_ID = "lockId"; + private static final String LOCK_TABLE_COL_EXPIRE_TS_MILLIS = "expireTimestampMillis"; + private static final long LOCK_TABLE_CREATION_WAIT_MS = 5000; + private static final int LOCK_TABLE_CREATION_WAIT_ROUNDS = 10; + + private static final List<KeySchemaElement> LOCK_TABLE_SCHEMA = Lists.newArrayList( + KeySchemaElement.builder() + .attributeName(LOCK_TABLE_COL_LOCK_ID) + .keyType(KeyType.HASH) + .build() + ); + + private static final List<AttributeDefinition> LOCK_TABLE_COL_DEFINITIONS = Lists.newArrayList( + AttributeDefinition.builder() + .attributeName(LOCK_TABLE_COL_LOCK_ID) + .attributeType(ScalarAttributeType.S) + .build() + ); + + private final DynamoDbClient dynamo; + private final AwsProperties awsProperties; + + DynamoLockManager(DynamoDbClient dynamo, AwsProperties awsProperties) { + this.dynamo = dynamo; + this.awsProperties = awsProperties; + ensureLockTableExistsOrCreate(); + } + + private void ensureLockTableExistsOrCreate() { + ensureTableExistsOrCreate(awsProperties.glueCatalogLockTable(), LOCK_TABLE_SCHEMA, LOCK_TABLE_COL_DEFINITIONS); + } + + private void ensureTableExistsOrCreate(String tableName, List<KeySchemaElement> schema, + List<AttributeDefinition> definitions) { + try { + dynamo.describeTable(DescribeTableRequest.builder() + .tableName(tableName) + .build()); + } catch (ResourceNotFoundException e) { + LOG.info("Glue lock DynamoDB table <{}> not found, trying to create", tableName); + dynamo.createTable(CreateTableRequest.builder() + .tableName(tableName) + .keySchema(schema) + .attributeDefinitions(definitions) + .billingMode(BillingMode.PAY_PER_REQUEST) + .build()); + + boolean isTableActive = false; + int round = 0; + while (!isTableActive && round < LOCK_TABLE_CREATION_WAIT_ROUNDS) { + LOG.info("waiting for DynamoDB table <{}> to be active, round {}", tableName, round++); + try { + Thread.sleep(LOCK_TABLE_CREATION_WAIT_MS); + } catch (InterruptedException ie) { + Thread.currentThread().interrupt(); + LOG.warn("Glue lock DynamoDB table creation sleep interrupted", ie); + } + try { + DescribeTableResponse describeTableResponse = dynamo.describeTable(DescribeTableRequest.builder() + .tableName(tableName) + .build()); + isTableActive = describeTableResponse.table().tableStatus().equals(TableStatus.ACTIVE); + } catch (ResourceNotFoundException e2) { + LOG.error("describe table failed after table creation", e2); + } + } + + if (!isTableActive) { + throw new IllegalStateException(String.format("DynamoDB table <%s> failed to become active after %d ms", + tableName, LOCK_TABLE_CREATION_WAIT_MS * LOCK_TABLE_CREATION_WAIT_ROUNDS)); + } + } + } + + + @Override + public boolean tryLock(String lockId, long expireMillis) { + Review comment: Nit: No need for a newline at the start of a method. ########## File path: aws/src/main/java/org/apache/iceberg/aws/glue/DynamoLockManager.java ########## @@ -0,0 +1,190 @@ +/* + * 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.iceberg.aws.glue; + +import java.util.List; +import java.util.Map; +import org.apache.iceberg.aws.AwsProperties; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; +import org.apache.iceberg.relocated.com.google.common.collect.Maps; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import software.amazon.awssdk.services.dynamodb.DynamoDbClient; +import software.amazon.awssdk.services.dynamodb.model.AttributeDefinition; +import software.amazon.awssdk.services.dynamodb.model.AttributeValue; +import software.amazon.awssdk.services.dynamodb.model.BillingMode; +import software.amazon.awssdk.services.dynamodb.model.ConditionalCheckFailedException; +import software.amazon.awssdk.services.dynamodb.model.CreateTableRequest; +import software.amazon.awssdk.services.dynamodb.model.DeleteItemRequest; +import software.amazon.awssdk.services.dynamodb.model.DescribeTableRequest; +import software.amazon.awssdk.services.dynamodb.model.DescribeTableResponse; +import software.amazon.awssdk.services.dynamodb.model.KeySchemaElement; +import software.amazon.awssdk.services.dynamodb.model.KeyType; +import software.amazon.awssdk.services.dynamodb.model.PutItemRequest; +import software.amazon.awssdk.services.dynamodb.model.ResourceNotFoundException; +import software.amazon.awssdk.services.dynamodb.model.ScalarAttributeType; +import software.amazon.awssdk.services.dynamodb.model.TableStatus; + +/** + * DynamoDB implementation for the lock manager. + */ +class DynamoLockManager implements LockManager { + + private static final Logger LOG = LoggerFactory.getLogger(DynamoLockManager.class); + + private static final String LOCK_TABLE_COL_LOCK_ID = "lockId"; + private static final String LOCK_TABLE_COL_EXPIRE_TS_MILLIS = "expireTimestampMillis"; + private static final long LOCK_TABLE_CREATION_WAIT_MS = 5000; + private static final int LOCK_TABLE_CREATION_WAIT_ROUNDS = 10; + + private static final List<KeySchemaElement> LOCK_TABLE_SCHEMA = Lists.newArrayList( + KeySchemaElement.builder() + .attributeName(LOCK_TABLE_COL_LOCK_ID) + .keyType(KeyType.HASH) + .build() + ); + + private static final List<AttributeDefinition> LOCK_TABLE_COL_DEFINITIONS = Lists.newArrayList( + AttributeDefinition.builder() + .attributeName(LOCK_TABLE_COL_LOCK_ID) + .attributeType(ScalarAttributeType.S) + .build() + ); + + private final DynamoDbClient dynamo; + private final AwsProperties awsProperties; + + DynamoLockManager(DynamoDbClient dynamo, AwsProperties awsProperties) { + this.dynamo = dynamo; + this.awsProperties = awsProperties; + ensureLockTableExistsOrCreate(); + } + + private void ensureLockTableExistsOrCreate() { + ensureTableExistsOrCreate(awsProperties.glueCatalogLockTable(), LOCK_TABLE_SCHEMA, LOCK_TABLE_COL_DEFINITIONS); + } + + private void ensureTableExistsOrCreate(String tableName, List<KeySchemaElement> schema, + List<AttributeDefinition> definitions) { + try { + dynamo.describeTable(DescribeTableRequest.builder() + .tableName(tableName) + .build()); + } catch (ResourceNotFoundException e) { + LOG.info("Glue lock DynamoDB table <{}> not found, trying to create", tableName); + dynamo.createTable(CreateTableRequest.builder() + .tableName(tableName) + .keySchema(schema) + .attributeDefinitions(definitions) + .billingMode(BillingMode.PAY_PER_REQUEST) + .build()); + + boolean isTableActive = false; + int round = 0; + while (!isTableActive && round < LOCK_TABLE_CREATION_WAIT_ROUNDS) { + LOG.info("waiting for DynamoDB table <{}> to be active, round {}", tableName, round++); + try { + Thread.sleep(LOCK_TABLE_CREATION_WAIT_MS); + } catch (InterruptedException ie) { + Thread.currentThread().interrupt(); + LOG.warn("Glue lock DynamoDB table creation sleep interrupted", ie); + } + try { + DescribeTableResponse describeTableResponse = dynamo.describeTable(DescribeTableRequest.builder() + .tableName(tableName) + .build()); + isTableActive = describeTableResponse.table().tableStatus().equals(TableStatus.ACTIVE); + } catch (ResourceNotFoundException e2) { + LOG.error("describe table failed after table creation", e2); + } + } + + if (!isTableActive) { + throw new IllegalStateException(String.format("DynamoDB table <%s> failed to become active after %d ms", + tableName, LOCK_TABLE_CREATION_WAIT_MS * LOCK_TABLE_CREATION_WAIT_ROUNDS)); + } + } + } + + Review comment: Nit: double newline. ---------------------------------------------------------------- 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: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
