Merge pull request elastic#208 from rmuir/disable_response_metadata_cache

Disable response metadata cache.

Author: rmuir

pom.xml

@@ -32,7 +32,7 @@
  </parent>
 
  <properties>
- <amazonaws.version>1.9.23</amazonaws.version>
+ <amazonaws.version>1.9.34</amazonaws.version>
  </properties>
 
  <dependencies>

src/main/java/org/elasticsearch/cloud/aws/AwsEc2Service.java

@@ -62,6 +62,9 @@ public synchronized AmazonEC2 client() {
  }
 
  ClientConfiguration clientConfiguration = new ClientConfiguration();
+ // the response metadata cache is only there for diagnostics purposes,
+ // but can force objects from every response to the old generation.
+ clientConfiguration.setResponseMetadataCacheSize(0);
  String protocol = settings.get("cloud.aws.protocol", "https").toLowerCase();
  protocol = settings.get("cloud.aws.ec2.protocol", protocol).toLowerCase();
  if ("http".equals(protocol)) {

src/main/java/org/elasticsearch/cloud/aws/InternalAwsS3Service.java

@@ -89,6 +89,9 @@ private synchronized AmazonS3 getClient(String endpoint, String protocol, String
  }
 
  ClientConfiguration clientConfiguration = new ClientConfiguration();
+ // the response metadata cache is only there for diagnostics purposes,
+ // but can force objects from every response to the old generation.
+ clientConfiguration.setResponseMetadataCacheSize(0);
  if (protocol == null) {
  protocol = settings.get("cloud.aws.protocol", "https").toLowerCase();
  protocol = settings.get("cloud.aws.s3.protocol", protocol).toLowerCase();

src/test/java/org/elasticsearch/cloud/aws/AmazonS3Wrapper.java

@@ -257,6 +257,26 @@ public void deleteBucket(String bucketName) throws AmazonClientException, Amazon
  delegate.deleteBucket(bucketName);
  }
 
+ @Override
+ public void setBucketReplicationConfiguration(String bucketName, BucketReplicationConfiguration configuration) throws AmazonServiceException, AmazonClientException {
+ delegate.setBucketReplicationConfiguration(bucketName, configuration);
+ }
+
+ @Override
+ public void setBucketReplicationConfiguration(SetBucketReplicationConfigurationRequest setBucketReplicationConfigurationRequest) throws AmazonServiceException, AmazonClientException {
+ delegate.setBucketReplicationConfiguration(setBucketReplicationConfigurationRequest);
+ }
+
+ @Override
+ public BucketReplicationConfiguration getBucketReplicationConfiguration(String bucketName) throws AmazonServiceException, AmazonClientException {
+ return delegate.getBucketReplicationConfiguration(bucketName);
+ }
+
+ @Override
+ public void deleteBucketReplicationConfiguration(String bucketName) throws AmazonServiceException, AmazonClientException {
+ delegate.deleteBucketReplicationConfiguration(bucketName);
+ }
+
  @Override
  public PutObjectResult putObject(PutObjectRequest putObjectRequest) throws AmazonClientException, AmazonServiceException {
  return delegate.putObject(putObjectRequest);