@@ -65,82 +65,6 @@ public final void wipeAfter() {
6565 cleanRepositoryFiles (basePath );
6666 }
6767
68- @ AwaitsFix (bugUrl = "https://github.com/elastic/elasticsearch-cloud-aws/issues/211" )
69- public void testSimpleWorkflow () {
70- Client client = client ();
71- Settings .Builder settings = Settings .builder ()
72- .put (S3Repository .CHUNK_SIZE_SETTING .getKey (), randomIntBetween (1000 , 10000 ));
73-
74- // We sometime test getting the base_path from node settings using repositories.s3.base_path
75- settings .put (S3Repository .BASE_PATH_SETTING .getKey (), basePath );
76-
77- logger .info ("--> creating s3 repository with bucket[{}] and path [{}]" , internalCluster ().getInstance (Settings .class ).get ("repositories.s3.bucket" ), basePath );
78- PutRepositoryResponse putRepositoryResponse = client .admin ().cluster ().preparePutRepository ("test-repo" )
79- .setType ("s3" ).setSettings (settings
80- ).get ();
81- assertThat (putRepositoryResponse .isAcknowledged (), equalTo (true ));
82-
83- createIndex ("test-idx-1" , "test-idx-2" , "test-idx-3" );
84- ensureGreen ();
85-
86- logger .info ("--> indexing some data" );
87- for (int i = 0 ; i < 100 ; i ++) {
88- index ("test-idx-1" , "doc" , Integer .toString (i ), "foo" , "bar" + i );
89- index ("test-idx-2" , "doc" , Integer .toString (i ), "foo" , "baz" + i );
90- index ("test-idx-3" , "doc" , Integer .toString (i ), "foo" , "baz" + i );
91- }
92- refresh ();
93- assertThat (client .prepareSearch ("test-idx-1" ).setSize (0 ).get ().getHits ().getTotalHits (), equalTo (100L ));
94- assertThat (client .prepareSearch ("test-idx-2" ).setSize (0 ).get ().getHits ().getTotalHits (), equalTo (100L ));
95- assertThat (client .prepareSearch ("test-idx-3" ).setSize (0 ).get ().getHits ().getTotalHits (), equalTo (100L ));
96-
97- logger .info ("--> snapshot" );
98- CreateSnapshotResponse createSnapshotResponse = client .admin ().cluster ().prepareCreateSnapshot ("test-repo" , "test-snap" ).setWaitForCompletion (true ).setIndices ("test-idx-*" , "-test-idx-3" ).get ();
99- assertThat (createSnapshotResponse .getSnapshotInfo ().successfulShards (), greaterThan (0 ));
100- assertThat (createSnapshotResponse .getSnapshotInfo ().successfulShards (), equalTo (createSnapshotResponse .getSnapshotInfo ().totalShards ()));
101-
102- assertThat (client .admin ().cluster ().prepareGetSnapshots ("test-repo" ).setSnapshots ("test-snap" ).get ().getSnapshots ().get (0 ).state (), equalTo (SnapshotState .SUCCESS ));
103-
104- logger .info ("--> delete some data" );
105- for (int i = 0 ; i < 50 ; i ++) {
106- client .prepareDelete ("test-idx-1" , "doc" , Integer .toString (i )).get ();
107- }
108- for (int i = 50 ; i < 100 ; i ++) {
109- client .prepareDelete ("test-idx-2" , "doc" , Integer .toString (i )).get ();
110- }
111- for (int i = 0 ; i < 100 ; i += 2 ) {
112- client .prepareDelete ("test-idx-3" , "doc" , Integer .toString (i )).get ();
113- }
114- refresh ();
115- assertThat (client .prepareSearch ("test-idx-1" ).setSize (0 ).get ().getHits ().getTotalHits (), equalTo (50L ));
116- assertThat (client .prepareSearch ("test-idx-2" ).setSize (0 ).get ().getHits ().getTotalHits (), equalTo (50L ));
117- assertThat (client .prepareSearch ("test-idx-3" ).setSize (0 ).get ().getHits ().getTotalHits (), equalTo (50L ));
118-
119- logger .info ("--> close indices" );
120- client .admin ().indices ().prepareClose ("test-idx-1" , "test-idx-2" ).get ();
121-
122- logger .info ("--> restore all indices from the snapshot" );
123- RestoreSnapshotResponse restoreSnapshotResponse = client .admin ().cluster ().prepareRestoreSnapshot ("test-repo" , "test-snap" ).setWaitForCompletion (true ).execute ().actionGet ();
124- assertThat (restoreSnapshotResponse .getRestoreInfo ().totalShards (), greaterThan (0 ));
125-
126- ensureGreen ();
127- assertThat (client .prepareSearch ("test-idx-1" ).setSize (0 ).get ().getHits ().getTotalHits (), equalTo (100L ));
128- assertThat (client .prepareSearch ("test-idx-2" ).setSize (0 ).get ().getHits ().getTotalHits (), equalTo (100L ));
129- assertThat (client .prepareSearch ("test-idx-3" ).setSize (0 ).get ().getHits ().getTotalHits (), equalTo (50L ));
130-
131- // Test restore after index deletion
132- logger .info ("--> delete indices" );
133- cluster ().wipeIndices ("test-idx-1" , "test-idx-2" );
134- logger .info ("--> restore one index after deletion" );
135- restoreSnapshotResponse = client .admin ().cluster ().prepareRestoreSnapshot ("test-repo" , "test-snap" ).setWaitForCompletion (true ).setIndices ("test-idx-*" , "-test-idx-2" ).execute ().actionGet ();
136- assertThat (restoreSnapshotResponse .getRestoreInfo ().totalShards (), greaterThan (0 ));
137- ensureGreen ();
138- assertThat (client .prepareSearch ("test-idx-1" ).setSize (0 ).get ().getHits ().getTotalHits (), equalTo (100L ));
139- ClusterState clusterState = client .admin ().cluster ().prepareState ().get ().getState ();
140- assertThat (clusterState .getMetaData ().hasIndex ("test-idx-1" ), equalTo (true ));
141- assertThat (clusterState .getMetaData ().hasIndex ("test-idx-2" ), equalTo (false ));
142- }
143-
14468 @ AwaitsFix (bugUrl = "https://github.com/elastic/elasticsearch-cloud-aws/issues/211" )
14569 public void testEncryption () {
14670 Client client = client ();
@@ -179,7 +103,7 @@ public void testEncryption() {
179103
180104 Settings settings = internalCluster ().getInstance (Settings .class );
181105 Settings bucket = settings .getByPrefix ("repositories.s3." );
182- try (AmazonS3Reference s3Client = internalCluster ().getInstance (AwsS3Service .class ).client ("default" )) {
106+ try (AmazonS3Reference s3Client = internalCluster ().getInstance (S3Service .class ).client ("default" )) {
183107 String bucketName = bucket .get ("bucket" );
184108 logger .info ("--> verify encryption for bucket [{}], prefix [{}]" , bucketName , basePath );
185109 List <S3ObjectSummary > summaries = s3Client .client ().listObjects (bucketName , basePath ).getObjectSummaries ();
@@ -442,7 +366,7 @@ public void cleanRepositoryFiles(String basePath) {
442366 // We check that settings has been set in elasticsearch.yml integration test file
443367 // as described in README
444368 assertThat ("Your settings in elasticsearch.yml are incorrect. Check README file." , bucketName , notNullValue ());
445- try (AmazonS3Reference s3Client = internalCluster ().getInstance (AwsS3Service .class ).client ("default" )) {
369+ try (AmazonS3Reference s3Client = internalCluster ().getInstance (S3Service .class ).client ("default" )) {
446370 ObjectListing prevListing = null ;
447371 //From http://docs.amazonwebservices.com/AmazonS3/latest/dev/DeletingMultipleObjectsUsingJava.html
448372 //we can do at most 1K objects per delete
0 commit comments