diff --git a/.travis.yml b/.travis.yml index b800960..6aa2c00 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,15 +2,15 @@ language: java sudo: required dist: trusty jdk: - - oraclejdk8 + - openjdk8 cache: directories: - "${HOME}/.m2" env: matrix: - #32 minutes + #32 minutes - MODULE="MultiStoreTest" CATEGORY="MultiDynamoDBStoreTestCategory" - #22 minutes + #22 minutes - MODULE="MultiVertexCentricQuery" CATEGORY="IsolateMultiVertexCentricQuery" #17.5 minutes - MODULE="SingleGraphTest" CATEGORY="SingleDynamoDBGraphTestCategory" @@ -18,38 +18,34 @@ env: - MODULE="SingleStoreTest" CATEGORY="SingleDynamoDBStoreTestCategory" #16.5 minutes - MODULE="MultiLargeJointIndexRetrieval" CATEGORY="IsolateMultiLargeJointIndexRetrieval" - #15.7 minutes - - MODULE="MultiOLAPTest" CATEGORY="MultiDynamoDBOLAPTestCategory" + #15.7 minutes - currently MultiOLAPTest is flaky + # - MODULE="MultiOLAPTest" CATEGORY="MultiDynamoDBOLAPTestCategory" #13.5 minutes - MODULE="MultiGraphTest" CATEGORY="MultiDynamoDBGraphTestCategory" #11.8 minutes - MODULE="MultiEdgesExceedCacheSize" CATEGORY="IsolateMultiEdgesExceedCacheSize" - #12 minutes + #12 minutes - MODULE="SingleIdAuthorityLogStore" CATEGORY="SingleIdAuthorityLogStoreCategory" - #11 minutes + #11 minutes - MODULE="MultiIdAuthorityLogStore" CATEGORY="MultiIdAuthorityLogStoreCategory" - #9 minutes + #9 minutes - MODULE="SingleOLAPTest" CATEGORY="SingleDynamoDBOLAPTestCategory" - #8.7 minutes + #8.7 minutes - MODULE="MultiConcurrentGetSliceAndMutate" CATEGORY="IsolateMultiConcurrentGetSliceAndMutate" - #8.5 minutes + #8.5 minutes - MODULE="RemainingTestsCategory" CATEGORY="IsolateRemainingTestsCategory" - #6.5 minutes + #6.5 minutes - MODULE="MultiConcurrentGetSlice" CATEGORY="IsolateMultiConcurrentGetSlice" - #6.4 minutes + #6.4 minutes - MODULE="SingleConcurrentGetSliceAndMutate" CATEGORY="IsolateSingleConcurrentGetSliceAndMutate" - #4.8 minutes + #6 minutes + - MODULE="GraphSimpleLogTest" CATEGORY="GraphSimpleLogTestCategory" + #4.8 minutes - MODULE="SingleConcurrentGetSlice" CATEGORY="IsolateSingleConcurrentGetSlice" - #3.2 + #3.2 minutes - MODULE="SingleMultiWriteStoreTestCategory" CATEGORY="SingleDynamoDBMultiWriteStoreTestCategory" - #2.8 minutes + #2.8 minutes - MODULE="MultiMultiWriteStoreTestCategory" CATEGORY="MultiDynamoDBMultiWriteStoreTestCategory" - #To be added - - MODULE="GraphSimpleLogTest" CATEGORY="GraphSimpleLogTestCategory" -addons: - apt: - packages: - - oracle-java8-installer branches: only: - 1.0.0 @@ -64,5 +60,5 @@ script: #- aws cloudformation validate-template --region us-west-2 --template-body `pwd | sed -e 's/\//\/\//g' -e 's/^/file:\//' -e 's/$/\/\/dynamodb-janusgraph-tables-multiple\.yaml/'` notifications: email: - - amcp@amazon.co.jp + - amcpatrikalakis@gmail.com - johanjcbs@gmail.com diff --git a/README.md b/README.md index a961fb8..a7e5152 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ account in the same region. multiple-item model based on graph size and utilization. * Test graph locally with DynamoDB Local. * Integrated with JanusGraph metrics. -* JanusGraph 0.2.0 and TinkerPop 3.2.6 compatibility. +* JanusGraph 0.2.1 and TinkerPop 3.2.9 compatibility. * Upgrade compatibility from Titan 1.0.0. ## Getting Started @@ -73,7 +73,7 @@ Storage Backend for JanusGraph installed. :remote connect tinkerpop.server conf/remote.yaml session :remote console ``` -5. Load the first 100 lines of the Marvel graph using the Gremlin shell. +5. Load the first 10 lines of the Marvel graph using the Gremlin shell. ```groovy com.amazon.janusgraph.example.MarvelGraphFactory.load(graph, 100, false) diff --git a/dynamodb-janusgraph-storage-backend-cfn.yaml b/dynamodb-janusgraph-storage-backend-cfn.yaml index 8778797..962f490 100644 --- a/dynamodb-janusgraph-storage-backend-cfn.yaml +++ b/dynamodb-janusgraph-storage-backend-cfn.yaml @@ -2,61 +2,64 @@ Description: This stack creates a VPC, an EC2 Amazon Linux host in the VPC with a Public IP, and deploys Gremlin Server on it. **WARNING** This template creates an Amazon EC2 instance. You will be billed for the AWS resources used if you - create a stack from this template. + create a stack from this template. AL 2018 AMI current as of 2018-06-22. AWSTemplateFormatVersion: '2010-09-09' Mappings: AWSRegionArch2AMI: ap-south-1: - HVMG2: ami-52c7b43d - HVM64: ami-f5c6b59a + HVMG2: ami-5a8da735 + HVM64: ami-bc83a9d3 + eu-west-3: + HVM64: ami-78f24205 + HVMG2: ami-d50bbaa8 eu-west-2: - HVMG2: ami-b6daced2 - HVM64: ami-b7daced3 + HVMG2: ami-b2b55cd5 + HVM64: ami-e2b35a85 eu-west-1: - HVMG2: ami-01ccc867 - PV64: ami-d1c0c4b7 - HVM64: ami-d3c0c4b5 + PV64: ami-3c5758d6 + HVM64: ami-41505fab + HVMG2: ami-e4515e0e ap-northeast-2: - HVM64: ami-9a15c7f4 - HVMG2: ami-9d15c7f3 + HVM64: ami-5bd46135 + HVMG2: ami-ebc47185 ap-northeast-1: - PV64: ami-30391657 - HVM64: ami-6a3b140d - HVMG2: ami-923d12f5 + HVM64: ami-449f483b + PV64: ami-6593441a + HVMG2: ami-9c9443e3 sa-east-1: - HVM64: ami-2bccae47 - PV64: ami-36cfad5a - HVMG2: ami-37cfad5b + HVM64: ami-09d58f65 + PV64: ami-6dd58f01 + HVMG2: ami-83d58fef ca-central-1: - HVMG2: ami-0bd66a6f - HVM64: ami-73d06c17 + HVMG2: ami-03e86a67 + HVM64: ami-49e86a2d ap-southeast-1: - PV64: ami-ab5ce5c8 - HVM64: ami-b65de4d5 - HVMG2: ami-fc5ae39f + PV64: ami-c8fcffb4 + HVM64: ami-d6fdfeaa + HVMG2: ami-ed838091 ap-southeast-2: - HVMG2: ami-162c2575 - HVM64: ami-762a2315 - PV64: ami-af2128cc + HVMG2: ami-33f92051 + HVM64: ami-4ff8212d + PV64: ami-c4c71ea6 eu-central-1: - HVM64: ami-506fbd3f - HVMG2: ami-b968bad6 - PV64: ami-ba68bad5 + PV64: ami-1a744bf1 + HVMG2: ami-a058674b + HVM64: ami-e056690b us-east-1: - PV64: ami-668f1e70 - HVMG2: ami-c58c1dd3 - HVM64: ami-fd8617eb + PV64: ami-b41445cb + HVMG2: ami-cfe4b2b0 + HVM64: ami-f316478c us-east-2: - HVMG2: ami-4191b524 - HVM64: ami-6693b703 + HVMG2: ami-40142d25 + HVM64: ami-ae0f36cb us-west-1: - PV64: ami-0f85a06f - HVMG2: ami-7a85a01a - HVM64: ami-f887a298 + HVMG2: ami-0e86606d + PV64: ami-1a876179 + HVM64: ami-25bf5946 us-west-2: - HVM64: ami-3234a652 - HVMG2: ami-4836a428 - PV64: ami-c737a5a7 + HVMG2: ami-0ad99772 + PV64: ami-21d09e59 + HVM64: ami-39d39d41 AWSInstanceType2Arch: t2.nano: Arch: HVM64 @@ -84,13 +87,29 @@ Mappings: Arch: HVM64 m4.16xlarge: Arch: HVM64 - m3.medium: + m5.large: Arch: HVM64 - m3.large: + m5.xlarge: Arch: HVM64 - m3.xlarge: + m5.2xlarge: Arch: HVM64 - m3.2xlarge: + m5.4xlarge: + Arch: HVM64 + m5.12xlarge: + Arch: HVM64 + m5.24xlarge: + Arch: HVM64 + m5d.large: + Arch: HVM64 + m5d.xlarge: + Arch: HVM64 + m5d.2xlarge: + Arch: HVM64 + m5d.4xlarge: + Arch: HVM64 + m5d.12xlarge: + Arch: HVM64 + m5d.24xlarge: Arch: HVM64 c4.large: Arch: HVM64 @@ -102,25 +121,27 @@ Mappings: Arch: HVM64 c4.8xlarge: Arch: HVM64 - c3.large: + c5.large: + Arch: HVM64 + c5.xlarge: Arch: HVM64 - c3.xlarge: + c5.2xlarge: Arch: HVM64 - c3.2xlarge: + c5.4xlarge: Arch: HVM64 - c3.4xlarge: + c5.9xlarge: Arch: HVM64 - c3.8xlarge: + c5.18xlarge: Arch: HVM64 - r3.large: + c5d.xlarge: Arch: HVM64 - r3.xlarge: + c5d.2xlarge: Arch: HVM64 - r3.2xlarge: + c5d.4xlarge: Arch: HVM64 - r3.4xlarge: + c5d.9xlarge: Arch: HVM64 - r3.8xlarge: + c5d.18xlarge: Arch: HVM64 r4.large: Arch: HVM64 @@ -138,6 +159,18 @@ Mappings: Arch: HVM64 x1.32xlarge: Arch: HVM64 + x1e.xlarge: + Arch: HVM64 + x1e.2xlarge: + Arch: HVM64 + x1e.4xlarge: + Arch: HVM64 + x1e.8xlarge: + Arch: HVM64 + x1e.16xlarge: + Arch: HVM64 + x1e.32xlarge: + Arch: HVM64 d2.xlarge: Arch: HVM64 d2.2xlarge: @@ -146,13 +179,13 @@ Mappings: Arch: HVM64 d2.8xlarge: Arch: HVM64 - i2.xlarge: + h1.2xlarge: Arch: HVM64 - i2.2xlarge: + h1.4xlarge: Arch: HVM64 - i2.4xlarge: + h1.8xlarge: Arch: HVM64 - i2.8xlarge: + h1.16xlarge: Arch: HVM64 i3.large: Arch: HVM64 @@ -166,20 +199,30 @@ Mappings: Arch: HVM64 i3.16xlarge: Arch: HVM64 + i3.metal: + Arch: HVM64 f1.2xlarge: Arch: HVM64 f1.16xlarge: Arch: HVM64 + g3.4xlarge: + Arch: HVM64 + g3.8xlarge: + Arch: HVM64 + g3.16xlarge: + Arch: HVM64 p2.xlarge: Arch: HVM64 p2.8xlarge: Arch: HVM64 p2.16xlarge: Arch: HVM64 - g2.2xlarge: - Arch: HVMG2 - g2.8xlarge: - Arch: HVMG2 + p3.2xlarge: + Arch: HVM64 + p3.8xlarge: + Arch: HVM64 + p3.16xlarge: + Arch: HVM64 Parameters: InstanceType: Description: EC2 instance type @@ -502,16 +545,14 @@ Resources: - - "#!/bin/bash\n" - "export SDKMAN_DIR=/usr/local/sdkman && curl -s https://get.sdkman.io | bash && source /usr/local/sdkman/bin/sdkman-init.sh\n" - "echo 'export SDKMAN_DIR=/usr/local/sdkman; source /usr/local/sdkman/bin/sdkman-init.sh' > /etc/profile.d/sdkman.sh\n" - - "yum update -y -q -e 0 && yum upgrade -y -q -e 0 && yum install -y java-1.8.0-openjdk > /home/ec2-user/yumupdates.log\n" + - "yum update -y -q -e 0 && yum upgrade -y -q -e 0 && yum install -y -q java-1.8.0-openjdk-devel > /home/ec2-user/yumupdates.log\n" - "yum remove -y java-1.7.0-openjdk > /home/ec2-user/yumremovejava7.log\n" - "java -version > /home/ec2-user/java-version-before-sdkmvn.log\n" - - "sdk install java < /dev/null\n" - - "sdk current java > /home/ec2-user/java-version-from-sdkman.log\n" - "sdk install maven < /dev/null && set -x\n" - "mvn -version > /home/ec2-user/maven-installation-settings.log\n" - "export GREMLIN_SERVER_USERNAME='ec2-user'\n" - "export LOG_DIR=/var/log/gremlin-server\n" - - "export SERVER_DIRNAME=dynamodb-janusgraph-storage-backend-1.2.0\n" + - "export SERVER_DIRNAME=dynamodb-janusgraph-storage-backend-1.3.0\n" - "export SERVER_ZIP=${SERVER_DIRNAME}.zip\n" - "export PACKAGES_DIR=/usr/local/packages\n" - "export INSTALL_DIR=${PACKAGES_DIR}/${SERVER_DIRNAME}\n" @@ -558,7 +599,7 @@ Outputs: - Fn::GetAtt: - WebServerInstance - PublicDnsName - - " /usr/local/packages/dynamodb-janusgraph-storage-backend-1.2.0/bin/gremlin.sh" + - " /usr/local/packages/dynamodb-janusgraph-storage-backend-1.3.0/bin/gremlin.sh" Description: Use this remote shell to interact with the graph. GremlinServerEndpoint: Value: diff --git a/pom.xml b/pom.xml index e2ab1e4..377b79d 100644 --- a/pom.xml +++ b/pom.xml @@ -2,14 +2,14 @@ 4.0.0 com.amazonaws dynamodb-janusgraph-storage-backend - 1.2.0 + 1.3.0 jar Amazon DynamoDB Storage Backend for JanusGraph https://github.com/awslabs/dynamodb-janusgraph-storage-backend The Amazon DynamoDB Storage Backend for JanusGraph: Distributed Graph Database allows JanusGraph graphs to use DynamoDB as a storage backend. git@github.com:awslabs/dynamodb-janusgraph-storage-backend.git - jg0.2.0-1.2.0 + jg0.2.1-1.3.0 -Xms256m -Xmx1280m -XX:+HeapDumpOnOutOfMemoryError @@ -18,18 +18,19 @@ 4567 http://localhost:${dynamodb-local.port} 1.8 - 1.11.336 + 1.11.369 2.6.6 - 0.2.0 - 3.2.6 + 0.2.1 + 3.2.9 3.0.2 3.1.0 3.6.2 2.20 2.20 - 3.0.2 + 3.1.0 1.6.0 - 1.2.1 + 1.4.1 + 1.2.17 1.7.12 3.8 3.0.1 @@ -52,7 +53,7 @@ Alexander Patrikalakis - amcp@mit.edu + amcpatrikalakis@gmail.com https://www.linkedin.com/in/amcpatrix/en @@ -171,7 +172,7 @@ log4j log4j - 1.2.17 + ${log4j.version} test diff --git a/src/main/java/com/amazon/janusgraph/example/MarvelGraphFactory.java b/src/main/java/com/amazon/janusgraph/example/MarvelGraphFactory.java index 72057d0..8a9f1fe 100644 --- a/src/main/java/com/amazon/janusgraph/example/MarvelGraphFactory.java +++ b/src/main/java/com/amazon/janusgraph/example/MarvelGraphFactory.java @@ -203,7 +203,7 @@ public void run() { command.run(); } catch (Throwable e) { final Throwable rootCause = ExceptionUtils.getRootCause(e); - final String rootCauseMessage = Optional.ofNullable(rootCause.getMessage()).orElse(""); + final String rootCauseMessage = Optional.ofNullable(rootCause).map(Throwable::getMessage).orElse(""); log.error("Error processing comic book {} {}", e.getMessage(), rootCauseMessage, e); } if (i++ % BATCH_SIZE == 0) { diff --git a/src/test/resources/current-gen-instance-types b/src/test/resources/current-gen-instance-types index 90c9506..6d98999 100644 --- a/src/test/resources/current-gen-instance-types +++ b/src/test/resources/current-gen-instance-types @@ -11,25 +11,34 @@ m4.2xlarge m4.4xlarge m4.10xlarge m4.16xlarge -m3.medium -m3.large -m3.xlarge -m3.2xlarge +m5.large +m5.xlarge +m5.2xlarge +m5.4xlarge +m5.12xlarge +m5.24xlarge +m5d.large +m5d.xlarge +m5d.2xlarge +m5d.4xlarge +m5d.12xlarge +m5d.24xlarge c4.large c4.xlarge c4.2xlarge c4.4xlarge c4.8xlarge -c3.large -c3.xlarge -c3.2xlarge -c3.4xlarge -c3.8xlarge -r3.large -r3.xlarge -r3.2xlarge -r3.4xlarge -r3.8xlarge +c5.large +c5.xlarge +c5.2xlarge +c5.4xlarge +c5.9xlarge +c5.18xlarge +c5d.xlarge +c5d.2xlarge +c5d.4xlarge +c5d.9xlarge +c5d.18xlarge r4.large r4.xlarge r4.2xlarge @@ -38,24 +47,35 @@ r4.8xlarge r4.16xlarge x1.16xlarge x1.32xlarge +x1e.xlarge +x1e.2xlarge +x1e.4xlarge +x1e.8xlarge +x1e.16xlarge +x1e.32xlarge d2.xlarge d2.2xlarge d2.4xlarge d2.8xlarge -i2.xlarge -i2.2xlarge -i2.4xlarge -i2.8xlarge +h1.2xlarge +h1.4xlarge +h1.8xlarge +h1.16xlarge i3.large i3.xlarge i3.2xlarge i3.4xlarge i3.8xlarge i3.16xlarge +i3.metal f1.2xlarge f1.16xlarge +g3.4xlarge +g3.8xlarge +g3.16xlarge p2.xlarge p2.8xlarge p2.16xlarge -g2.2xlarge -g2.8xlarge +p3.2xlarge +p3.8xlarge +p3.16xlarge diff --git a/src/test/resources/dynamodb-janusgraph-docker/Dockerfile b/src/test/resources/dynamodb-janusgraph-docker/Dockerfile index 34b8dfe..573f699 100644 --- a/src/test/resources/dynamodb-janusgraph-docker/Dockerfile +++ b/src/test/resources/dynamodb-janusgraph-docker/Dockerfile @@ -1,5 +1,5 @@ # -# Copyright 2017 Amazon.com, Inc. or its affiliates. All Rights Reserved. +# Copyright 2017-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved. # Portions copyright 2017 JanusGraph authors # # Licensed under the Apache License, Version 2.0 (the "License"). @@ -13,13 +13,13 @@ # express or implied. See the License for the specific language governing # permissions and limitations under the License. # -FROM openjdk:8 +FROM amazonlinux +RUN yum update -y -q -e 0 && yum upgrade -y -q -e 0 && yum install -y -q java-1.8.0-openjdk unzip ARG server_zip ADD ${server_zip} /var -RUN apt-get update -y && apt-get install -y zip && \ - server_base=`basename ${server_zip} .zip` && \ +RUN server_base=`basename ${server_zip} .zip` && \ unzip -q /var/${server_base}.zip -d /var && \ mv /var/${server_base} /var/jg diff --git a/src/test/resources/dynamodb-local-docker.properties b/src/test/resources/dynamodb-local-docker.properties index 826858a..ba60383 100644 --- a/src/test/resources/dynamodb-local-docker.properties +++ b/src/test/resources/dynamodb-local-docker.properties @@ -1,5 +1,5 @@ # -# Copyright 2014-2017 Amazon.com, Inc. or its affiliates. All Rights Reserved. +# Copyright 2014-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved. # # Licensed under the Apache License, Version 2.0 (the "License"). # You may not use this file except in compliance with the License. @@ -28,3 +28,33 @@ storage.dynamodb.client.credentials.class-name=com.amazonaws.auth.BasicAWSCreden storage.dynamodb.client.credentials.constructor-args=access,secret storage.dynamodb.client.signing-region=us-east-1 storage.dynamodb.client.endpoint=http://dynamodb-local:8000 + +storage.dynamodb.stores.edgestore.initial-capacity-read=12 +storage.dynamodb.stores.edgestore.initial-capacity-write=12 +storage.dynamodb.stores.edgestore.read-rate=1000 +storage.dynamodb.stores.edgestore.write-rate=1000 + +storage.dynamodb.stores.graphindex.initial-capacity-read=9 +storage.dynamodb.stores.graphindex.initial-capacity-write=9 +storage.dynamodb.stores.graphindex.read-rate=1000 +storage.dynamodb.stores.graphindex.write-rate=1000 + +storage.dynamodb.stores.systemlog.initial-capacity-read=1 +storage.dynamodb.stores.systemlog.initial-capacity-write=1 +storage.dynamodb.stores.systemlog.read-rate=1 +storage.dynamodb.stores.systemlog.write-rate=1 + +storage.dynamodb.stores.janusgraph_ids.initial-capacity-read=1 +storage.dynamodb.stores.janusgraph_ids.initial-capacity-write=1 +storage.dynamodb.stores.janusgraph_ids.read-rate=1 +storage.dynamodb.stores.janusgraph_ids.write-rate=1 + +storage.dynamodb.stores.system_properties.initial-capacity-read=1 +storage.dynamodb.stores.system_properties.initial-capacity-write=1 +storage.dynamodb.stores.system_properties.read-rate=1 +storage.dynamodb.stores.system_properties.write-rate=1 + +storage.dynamodb.stores.txlog.initial-capacity-read=1 +storage.dynamodb.stores.txlog.initial-capacity-write=1 +storage.dynamodb.stores.txlog.read-rate=1 +storage.dynamodb.stores.txlog.write-rate=1 diff --git a/src/test/resources/dynamodb-local-docker/Dockerfile b/src/test/resources/dynamodb-local-docker/Dockerfile index 4eee340..88b0aa2 100644 --- a/src/test/resources/dynamodb-local-docker/Dockerfile +++ b/src/test/resources/dynamodb-local-docker/Dockerfile @@ -1,5 +1,5 @@ # -# Copyright 2017 Amazon.com, Inc. or its affiliates. All Rights Reserved. +# Copyright 2017-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved. # Portions copyright 2017 JanusGraph authors # # Licensed under the Apache License, Version 2.0 (the "License"). @@ -13,9 +13,10 @@ # express or implied. See the License for the specific language governing # permissions and limitations under the License. # -FROM openjdk:8 +FROM amazonlinux -RUN apt-get update -y && apt-get install -y zip sqlite3 libsqlite3-dev \ +RUN yum update -y -q -e 0 && yum upgrade -y -q -e 0 \ + && yum install -y -q java-1.8.0-openjdk-devel sqlite3 libsqlite3-dev wget tar gzip \ && mkdir -p /var/dynamodblocal WORKDIR /var/dynamodblocal RUN wget https://s3-us-west-2.amazonaws.com/dynamodb-local/dynamodb_local_latest.tar.gz -q -O - | tar -xz diff --git a/src/test/resources/dynamodb-local.properties b/src/test/resources/dynamodb-local.properties index 946498d..12a85c0 100644 --- a/src/test/resources/dynamodb-local.properties +++ b/src/test/resources/dynamodb-local.properties @@ -1,5 +1,5 @@ # -# Copyright 2014-2017 Amazon.com, Inc. or its affiliates. All Rights Reserved. +# Copyright 2014-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved. # # Licensed under the Apache License, Version 2.0 (the "License"). # You may not use this file except in compliance with the License. @@ -28,3 +28,33 @@ storage.dynamodb.client.credentials.class-name=com.amazonaws.auth.BasicAWSCreden storage.dynamodb.client.credentials.constructor-args=access,secret storage.dynamodb.client.signing-region=us-east-1 storage.dynamodb.client.endpoint=http://localhost:4567 + +storage.dynamodb.stores.edgestore.initial-capacity-read=12 +storage.dynamodb.stores.edgestore.initial-capacity-write=12 +storage.dynamodb.stores.edgestore.read-rate=1000 +storage.dynamodb.stores.edgestore.write-rate=1000 + +storage.dynamodb.stores.graphindex.initial-capacity-read=9 +storage.dynamodb.stores.graphindex.initial-capacity-write=9 +storage.dynamodb.stores.graphindex.read-rate=1000 +storage.dynamodb.stores.graphindex.write-rate=1000 + +storage.dynamodb.stores.systemlog.initial-capacity-read=1 +storage.dynamodb.stores.systemlog.initial-capacity-write=1 +storage.dynamodb.stores.systemlog.read-rate=1 +storage.dynamodb.stores.systemlog.write-rate=1 + +storage.dynamodb.stores.janusgraph_ids.initial-capacity-read=1 +storage.dynamodb.stores.janusgraph_ids.initial-capacity-write=1 +storage.dynamodb.stores.janusgraph_ids.read-rate=1 +storage.dynamodb.stores.janusgraph_ids.write-rate=1 + +storage.dynamodb.stores.system_properties.initial-capacity-read=1 +storage.dynamodb.stores.system_properties.initial-capacity-write=1 +storage.dynamodb.stores.system_properties.read-rate=1 +storage.dynamodb.stores.system_properties.write-rate=1 + +storage.dynamodb.stores.txlog.initial-capacity-read=1 +storage.dynamodb.stores.txlog.initial-capacity-write=1 +storage.dynamodb.stores.txlog.read-rate=1 +storage.dynamodb.stores.txlog.write-rate=1 diff --git a/src/test/resources/dynamodb.properties b/src/test/resources/dynamodb.properties index 543e006..dd8df80 100644 --- a/src/test/resources/dynamodb.properties +++ b/src/test/resources/dynamodb.properties @@ -1,5 +1,5 @@ # -# Copyright 2014-2017 Amazon.com, Inc. or its affiliates. All Rights Reserved. +# Copyright 2014-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved. # # Licensed under the Apache License, Version 2.0 (the "License"). # You may not use this file except in compliance with the License. @@ -27,6 +27,8 @@ storage.backend=com.amazon.janusgraph.diskstorage.dynamodb.DynamoDBStoreManager storage.dynamodb.client.credentials.class-name=com.amazonaws.auth.DefaultAWSCredentialsProviderChain storage.dynamodb.client.credentials.constructor-args= storage.dynamodb.client.signing-region=us-west-2 + + storage.dynamodb.stores.edgestore.initial-capacity-read=12 storage.dynamodb.stores.edgestore.initial-capacity-write=12 storage.dynamodb.stores.edgestore.read-rate=12 diff --git a/src/test/resources/get-recent-al-amis.sh b/src/test/resources/get-recent-al-amis.sh index fab2889..b471ed3 100755 --- a/src/test/resources/get-recent-al-amis.sh +++ b/src/test/resources/get-recent-al-amis.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright 2017 Amazon.com, Inc. or its affiliates. All Rights Reserved. +# Copyright 2017-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved. # # Licensed under the Apache License, Version 2.0 (the "License"). # You may not use this file except in compliance with the License. @@ -23,7 +23,7 @@ aws ec2 describe-regions --query 'Regions[*].[RegionName]' | sed -e '/\[/d' -e ' --region ${region} \ --owners amazon \ --filters "Name=root-device-type,Values=ebs" "Name=name,Values=amzn-ami-*" \ - --query 'Images[? CreationDate > `'${LATER_THAN_DATE}'` && !contains(Name, `minimal`) && !contains(Name, `nat`)].[ImageId, ImageLocation]' |\ + --query 'Images[? CreationDate>`'${LATER_THAN_DATE}'` && !contains(Name, `minimal`) && !contains(Name, `nat`) && !contains(Name, `ecs-optimized`) && !contains(Name, `beta`)].[ImageId, ImageLocation]' |\ grep "\"" |\ sed -e 's/^[ ]*\(.*\)[ ]*$/\1/' -e '/\"$/s/$/%/' |\ tr "\n" "@" |\ diff --git a/src/test/resources/gremlin-server-service.sh b/src/test/resources/gremlin-server-service.sh index 1aaa0fe..7a87ba4 100644 --- a/src/test/resources/gremlin-server-service.sh +++ b/src/test/resources/gremlin-server-service.sh @@ -68,7 +68,7 @@ # 2b) If you're running Ubuntu: update-rc.d gremlin-server defaults # # You have to SET the Gremlin Server installation directory here: -SVR="/usr/local/packages/dynamodb-janusgraph-storage-backend-1.2.0" +SVR="/usr/local/packages/dynamodb-janusgraph-storage-backend-1.3.0" SVR_LOG="/var/log/gremlin-server" # Specify the user to run Gremlin Server as: SVR_USER="ec2-user" diff --git a/src/test/resources/install-gremlin-server.sh b/src/test/resources/install-gremlin-server.sh index fff0afa..ad365cb 100755 --- a/src/test/resources/install-gremlin-server.sh +++ b/src/test/resources/install-gremlin-server.sh @@ -55,7 +55,7 @@ mvn -q -T 1C install -Dmaven.test.skip=true -DskipTests=true $MVN_OPT_PARAMS # | # -pom.xml # -server - WORKDIR -# |-janusgraph-0.2.0-hadoop2 - JANUSGRAPH_VANILLA_SERVER_DIRNAME +# |-janusgraph-0.2.1-hadoop2 - JANUSGRAPH_VANILLA_SERVER_DIRNAME # |-dynamodb-janusgraph-storage-backend-X.Y.Z - JANUSGRAPH_DYNAMODB_SERVER_DIRNAME # |-dynamodb-janusgraph-storage-backend-X.Y.Z.zip - JANUSGRAPH_DYNAMODB_SERVER_ZIP # | @@ -98,7 +98,7 @@ mvn test -q -Pdownload-janusgraph-server-zip $MVN_OPT_PARAMS > /dev/null 2>&1 #verify pushd target -wget https://github.com/JanusGraph/janusgraph/releases/download/v0.2.0/KEYS +wget https://github.com/JanusGraph/janusgraph/releases/download/v0.2.1/KEYS popd gpg --import target/KEYS gpg --verify src/test/resources/${JANUSGRAPH_VANILLA_SERVER_ZIP}.asc server/${JANUSGRAPH_VANILLA_SERVER_ZIP} diff --git a/src/test/resources/janusgraph-0.2.0-hadoop2.zip.asc b/src/test/resources/janusgraph-0.2.0-hadoop2.zip.asc deleted file mode 100644 index 76abe6f..0000000 --- a/src/test/resources/janusgraph-0.2.0-hadoop2.zip.asc +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1 - -iQIcBAABCgAGBQJZ3oovAAoJEGa4X/FBgCuoZrEP/15iXGPfGB8N26aTnaTEcOUR -7Qksk6FnnGy/gRUu0BrAaTcoHGYZJ7kTGlBIas3HAWt7kOfdTtgoJxaGyjNir/oo -zoqhwC369XysXem3UGiJh4sbOpmqh6TQTsg6hgPTIsF/FJCgtZntV5ozVr+lxPtV -pFobG1bVKdeiC89Y0nqQ+6NcdkwEMqHyWUKh2AfNrIG82omp/yWVJJe+Hl5VA7nZ -WUdz0A87f07+VFbBkHBx0z5iCymd7Tps59ohWsf6RrVxZtNaXApvqz5MN3WhvukP -S3rJgfWpI7KgDceg96SGcs4Ep/gCx9PiK0EUbQt4kj0vpKS28YzCyJ+xG8/vSy4V -0x+GWWXXWDxkaxdnWCg86Uq5tPZKTWFD9x53W0LfHZhKXuaF+VAm8czLRPXvwI1z -KKJdIQFZ8iQWk6e2s+OangM0m4HlADS8W669NRO582oimG3fIdtUxlKm9l4dM6/p -GGGggFALaeT3tcduFsS5/9BDIamEFdAVUR/J5oRdTKyX9qQUp/sY6PFUSg1Qw7Sc -Bcr1Qs8F/GNpGxKRa+DVU3WluFUqiqt3Kv8A/aBtIjqKKBIo6FpHMe3zrtn99qvz -fLYKlmgDgoeHgHYW87ua0vRq9YTqvIMsKuFQIWs1lScupUaO4Qifq9ohMffaVA21 -jUB5sikK//jKosQ39fG7 -=4zSE ------END PGP SIGNATURE----- diff --git a/src/test/resources/janusgraph-0.2.1-hadoop2.zip.asc b/src/test/resources/janusgraph-0.2.1-hadoop2.zip.asc new file mode 100644 index 0000000..0f41b1d --- /dev/null +++ b/src/test/resources/janusgraph-0.2.1-hadoop2.zip.asc @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1 + +iQIcBAABCgAGBQJbRBwgAAoJEGa4X/FBgCuo2g0P/22eRdKbB7WmcaobiS5YGeSp +RMlvJoOpflJvJ5elpm/MjJfDj0Il1wDCmmE24BuPQX1kzk/crjIb+XC4RB8P3K6I +j0xOrO+eztQ4/W+wOlqzV1bAED6JqY5hZWgkMRyQumB9155p3UCwO126JV3UpJDz +Vtbn1R8mjIxVZxpP75EBfDiqQG4Xjc+y/1tsBaJaHdAwkNLXxcb4qWji4pYUF3mb +AvfEB9xZlJ8T/e9u6PY4NhlsGE54YuPFDIx2t3b6DUW7dcg3V1411aA13NaYrH6N +Yn3QatjwQ/Rzb4n/asojuzmfjMm2BLnWHgX9IP+Mjhcbce4+5IbRJhoe446VPFiI +YLDpxWDlY3aYopTk0fTDaGClcDlUZtXeCSNN8OnGz0x97af8jragxyNG9N6jxNYt +H8bHNM6kQrJvTj6YD4WXfyHlXLokb+BlVvMAYBMdzQ3JIp7eX4WXFdueEcoo1zWS +7nD5lN5cDSxW/M9QAmRtmQy8AzDFEHPJQM4K3XY4/B18FyyehuMU9sklMHmGOmRm +hgx99KjU5ApMZxUBlDqat56eYBanLScUen4agHV17PHwJ73Xb765uvLFWqi0BUe2 +5K9F+xI6n9UEAx7/sNTQJgJQJ73WguK9+4zf0pcXeU4oACLUyOmIB7AuW5EuXf5e +02U5gcOFHUlxruqyTLUF +=VvSg +-----END PGP SIGNATURE-----