You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@james.apache.org by GitBox <gi...@apache.org> on 2021/05/17 10:50:14 UTC
[GitHub] [james-project] Arsnael opened a new pull request #436: WIP: JAMES-3586 CL one option for the Cassandra blob store
Arsnael opened a new pull request #436:
URL: https://github.com/apache/james-project/pull/436
Just a beginning, many things left to do...
--
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:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org
[GitHub] [james-project] Arsnael commented on pull request #436: JAMES-3586 CL one option for the Cassandra blob store
Posted by GitBox <gi...@apache.org>.
Arsnael commented on pull request #436:
URL: https://github.com/apache/james-project/pull/436#issuecomment-843741317
Build was green. Did a rebase and squashed commits
--
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:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org
[GitHub] [james-project] chibenwa commented on a change in pull request #436: JAMES-3586 CL one option for the Cassandra blob store
Posted by GitBox <gi...@apache.org>.
chibenwa commented on a change in pull request #436:
URL: https://github.com/apache/james-project/pull/436#discussion_r634221827
##########
File path: server/blob/blob-cassandra/src/main/java/org/apache/james/blob/cassandra/CassandraBlobStoreDAO.java
##########
@@ -168,7 +182,9 @@ private boolean isDefaultBucket(BucketName bucketName) {
private Mono<ByteBuffer> readPart(BucketName bucketName, BlobId blobId, Integer partIndex) {
if (configuration.isOptimisticConsistencyLevel()) {
return readPartClOne(bucketName, blobId, partIndex)
- .switchIfEmpty(readPartClDefault(bucketName, blobId, partIndex));
+ .doOnNext(any -> metricClOneHitCount.increment())
Review comment:
IMO yes.
--
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:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org
[GitHub] [james-project] chibenwa commented on a change in pull request #436: JAMES-3586 CL one option for the Cassandra blob store
Posted by GitBox <gi...@apache.org>.
chibenwa commented on a change in pull request #436:
URL: https://github.com/apache/james-project/pull/436#discussion_r634221583
##########
File path: server/blob/blob-cassandra/pom.xml
##########
@@ -65,6 +65,10 @@
<groupId>${james.groupId}</groupId>
<artifactId>james-server-util</artifactId>
</dependency>
+ <dependency>
+ <groupId>${james.groupId}</groupId>
+ <artifactId>metrics-logger</artifactId>
Review comment:
How about moving the forTesting stuff in tests, and fix imports of tests that depends on it?
> or add the metrics as a param in forTesting method?
Good solution and likely easier so :+1:
--
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:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org
[GitHub] [james-project] Arsnael edited a comment on pull request #436: JAMES-3586 CL one option for the Cassandra blob store
Posted by GitBox <gi...@apache.org>.
Arsnael edited a comment on pull request #436:
URL: https://github.com/apache/james-project/pull/436#issuecomment-843022310
> Falback mechanisms to QUORUM to avoid all inconsistencies
Are you sure you didn't review a bit fast???
Ok about the doc though
--
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:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org
[GitHub] [james-project] Arsnael edited a comment on pull request #436: JAMES-3586 CL one option for the Cassandra blob store
Posted by GitBox <gi...@apache.org>.
Arsnael edited a comment on pull request #436:
URL: https://github.com/apache/james-project/pull/436#issuecomment-843022310
> Falback mechanisms to QUORUM to avoid all inconsistencies
Are you sure you didn't review a bit fast??? the `switchIfEmpty` method is for that purpose
Ok about the doc though
--
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:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org
[GitHub] [james-project] Arsnael commented on pull request #436: JAMES-3586 CL one option for the Cassandra blob store
Posted by GitBox <gi...@apache.org>.
Arsnael commented on pull request #436:
URL: https://github.com/apache/james-project/pull/436#issuecomment-843022310
> Falback mechanisms to QUORUM to avoid all inconsistencies
Are you sure you didn't review a bit fast???
--
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:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org
[GitHub] [james-project] Arsnael commented on a change in pull request #436: JAMES-3586 CL one option for the Cassandra blob store
Posted by GitBox <gi...@apache.org>.
Arsnael commented on a change in pull request #436:
URL: https://github.com/apache/james-project/pull/436#discussion_r634214463
##########
File path: server/blob/blob-cassandra/pom.xml
##########
@@ -65,6 +65,10 @@
<groupId>${james.groupId}</groupId>
<artifactId>james-server-util</artifactId>
</dependency>
+ <dependency>
+ <groupId>${james.groupId}</groupId>
+ <artifactId>metrics-logger</artifactId>
Review comment:
I don't like that... at all... but I had to add something for CassandraBlobStoreFactory that is not in the test package and is being used by other test classes in other modules... Not sure what would be the best way here... or add the metrics as a param in forTesting method?
##########
File path: server/blob/blob-cassandra/src/main/java/org/apache/james/blob/cassandra/CassandraBlobStoreDAO.java
##########
@@ -166,6 +166,23 @@ private boolean isDefaultBucket(BucketName bucketName) {
}
private Mono<ByteBuffer> readPart(BucketName bucketName, BlobId blobId, Integer partIndex) {
+ if (configuration.isOptimisticConsistencyLevel()) {
+ return readPartClOne(bucketName, blobId, partIndex)
Review comment:
Was not sure if we need to apply it on the read for readPart too? But my guess is yes? Just want to be sure :)
##########
File path: server/blob/blob-cassandra/src/main/java/org/apache/james/blob/cassandra/CassandraBlobStoreDAO.java
##########
@@ -168,7 +182,9 @@ private boolean isDefaultBucket(BucketName bucketName) {
private Mono<ByteBuffer> readPart(BucketName bucketName, BlobId blobId, Integer partIndex) {
if (configuration.isOptimisticConsistencyLevel()) {
return readPartClOne(bucketName, blobId, partIndex)
- .switchIfEmpty(readPartClDefault(bucketName, blobId, partIndex));
+ .doOnNext(any -> metricClOneHitCount.increment())
Review comment:
Should we use the same metric for hit and miss between readBlob and readPart?
--
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:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org
[GitHub] [james-project] Arsnael commented on a change in pull request #436: JAMES-3586 CL one option for the Cassandra blob store
Posted by GitBox <gi...@apache.org>.
Arsnael commented on a change in pull request #436:
URL: https://github.com/apache/james-project/pull/436#discussion_r634216077
##########
File path: server/blob/blob-cassandra/pom.xml
##########
@@ -65,6 +65,10 @@
<groupId>${james.groupId}</groupId>
<artifactId>james-server-util</artifactId>
</dependency>
+ <dependency>
+ <groupId>${james.groupId}</groupId>
+ <artifactId>metrics-logger</artifactId>
Review comment:
https://github.com/apache/james-project/pull/436#discussion_r634214463
--
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:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org
[GitHub] [james-project] chibenwa commented on a change in pull request #436: JAMES-3586 CL one option for the Cassandra blob store
Posted by GitBox <gi...@apache.org>.
chibenwa commented on a change in pull request #436:
URL: https://github.com/apache/james-project/pull/436#discussion_r634209706
##########
File path: server/blob/blob-cassandra/pom.xml
##########
@@ -65,6 +65,10 @@
<groupId>${james.groupId}</groupId>
<artifactId>james-server-util</artifactId>
</dependency>
+ <dependency>
+ <groupId>${james.groupId}</groupId>
+ <artifactId>metrics-logger</artifactId>
Review comment:
Why? MetricFactory API is not enough?
##########
File path: server/blob/blob-cassandra/src/test/java/org/apache/james/blob/cassandra/CassandraBlobStoreClOneTest.java
##########
@@ -0,0 +1,216 @@
+package org.apache.james.blob.cassandra;
+
+import static org.apache.james.blob.api.BlobStore.StoragePolicy.LOW_COST;
+import static org.apache.james.blob.cassandra.CassandraBlobStoreDAO.CASSANDRA_BLOBSTORE_CL_ONE_HIT_COUNT_METRIC_NAME;
+import static org.apache.james.blob.cassandra.CassandraBlobStoreDAO.CASSANDRA_BLOBSTORE_CL_ONE_MISS_COUNT_METRIC_NAME;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.awaitility.Awaitility.await;
+import static org.awaitility.Durations.FIVE_SECONDS;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+
+import org.apache.commons.io.IOUtils;
+import org.apache.james.backends.cassandra.CassandraCluster;
+import org.apache.james.backends.cassandra.CassandraClusterExtension;
+import org.apache.james.backends.cassandra.init.configuration.CassandraConfiguration;
+import org.apache.james.blob.api.BlobId;
+import org.apache.james.blob.api.BlobStore;
+import org.apache.james.blob.api.BucketName;
+import org.apache.james.blob.api.HashBlobId;
+import org.apache.james.blob.api.MetricableBlobStore;
+import org.apache.james.blob.api.ObjectStoreException;
+import org.apache.james.metrics.api.MetricFactory;
+import org.apache.james.server.blob.deduplication.BlobStoreFactory;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import com.google.common.base.Strings;
+
+import reactor.core.publisher.Mono;
+
+class CassandraBlobStoreClOneTest implements CassandraBlobStoreContract {
+ @RegisterExtension
+ static CassandraClusterExtension cassandraCluster = new CassandraClusterExtension(CassandraBlobModule.MODULE);
+
+ private BlobStore testee;
+ private CassandraDefaultBucketDAO defaultBucketDAO;
+
+ @BeforeEach
+ void setUp(CassandraCluster cassandra) {
+ HashBlobId.Factory blobIdFactory = new HashBlobId.Factory();
+ CassandraBucketDAO bucketDAO = new CassandraBucketDAO(blobIdFactory, cassandra.getConf());
+ defaultBucketDAO = spy(new CassandraDefaultBucketDAO(cassandra.getConf()));
+ CassandraConfiguration cassandraConfiguration = CassandraConfiguration.builder()
+ .blobPartSize(CHUNK_SIZE)
+ .optimisticConsistencyLevel(true)
+ .build();
+ MetricFactory metricFactory = metricsTestExtension.getMetricFactory();
+ testee = new MetricableBlobStore(
+ metricFactory,
+ BlobStoreFactory.builder()
+ .blobStoreDAO(new CassandraBlobStoreDAO(defaultBucketDAO, bucketDAO, cassandraConfiguration, BucketName.DEFAULT, metricFactory))
+ .blobIdFactory(blobIdFactory)
+ .defaultBucketName()
+ .deduplication());
+ }
+
+ @Override
+ public BlobStore testee() {
+ return testee;
+ }
+
+ @Override
+ public BlobId.Factory blobIdFactory() {
+ return new HashBlobId.Factory();
+ }
+
+ @Override
+ public CassandraDefaultBucketDAO defaultBucketDAO() {
+ return defaultBucketDAO;
+ }
+
+ @Override
+ @Test
+ public void readShouldNotReturnInvalidResultsWhenPartialDataPresent() {
+ int repeatCount = MULTIPLE_CHUNK_SIZE * CHUNK_SIZE;
+ String longString = Strings.repeat("0123456789\n", repeatCount);
+ BlobId blobId = Mono.from(testee().save(testee().getDefaultBucketName(), longString, LOW_COST)).block();
+
+ when(defaultBucketDAO().readPartClOne(blobId, 1)).thenReturn(Mono.empty());
+ when(defaultBucketDAO().readPart(blobId, 1)).thenReturn(Mono.empty());
+
+ assertThatThrownBy(() -> IOUtils.toString(testee().read(testee().getDefaultBucketName(), blobId), StandardCharsets.UTF_8))
+ .isInstanceOf(ObjectStoreException.class)
+ .hasMessageContaining("Missing blob part for blobId");
Review comment:
No then we should fallback to CL QUORUM...
##########
File path: server/blob/blob-cassandra/src/test/java/org/apache/james/blob/cassandra/CassandraBlobStoreClOneTest.java
##########
@@ -0,0 +1,216 @@
+package org.apache.james.blob.cassandra;
Review comment:
Oups
##########
File path: server/blob/blob-cassandra/src/test/java/org/apache/james/blob/cassandra/CassandraBlobStoreClOneTest.java
##########
@@ -0,0 +1,216 @@
+package org.apache.james.blob.cassandra;
+
+import static org.apache.james.blob.api.BlobStore.StoragePolicy.LOW_COST;
+import static org.apache.james.blob.cassandra.CassandraBlobStoreDAO.CASSANDRA_BLOBSTORE_CL_ONE_HIT_COUNT_METRIC_NAME;
+import static org.apache.james.blob.cassandra.CassandraBlobStoreDAO.CASSANDRA_BLOBSTORE_CL_ONE_MISS_COUNT_METRIC_NAME;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.awaitility.Awaitility.await;
+import static org.awaitility.Durations.FIVE_SECONDS;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+
+import org.apache.commons.io.IOUtils;
+import org.apache.james.backends.cassandra.CassandraCluster;
+import org.apache.james.backends.cassandra.CassandraClusterExtension;
+import org.apache.james.backends.cassandra.init.configuration.CassandraConfiguration;
+import org.apache.james.blob.api.BlobId;
+import org.apache.james.blob.api.BlobStore;
+import org.apache.james.blob.api.BucketName;
+import org.apache.james.blob.api.HashBlobId;
+import org.apache.james.blob.api.MetricableBlobStore;
+import org.apache.james.blob.api.ObjectStoreException;
+import org.apache.james.metrics.api.MetricFactory;
+import org.apache.james.server.blob.deduplication.BlobStoreFactory;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import com.google.common.base.Strings;
+
+import reactor.core.publisher.Mono;
+
+class CassandraBlobStoreClOneTest implements CassandraBlobStoreContract {
+ @RegisterExtension
+ static CassandraClusterExtension cassandraCluster = new CassandraClusterExtension(CassandraBlobModule.MODULE);
+
+ private BlobStore testee;
+ private CassandraDefaultBucketDAO defaultBucketDAO;
+
+ @BeforeEach
+ void setUp(CassandraCluster cassandra) {
+ HashBlobId.Factory blobIdFactory = new HashBlobId.Factory();
+ CassandraBucketDAO bucketDAO = new CassandraBucketDAO(blobIdFactory, cassandra.getConf());
+ defaultBucketDAO = spy(new CassandraDefaultBucketDAO(cassandra.getConf()));
+ CassandraConfiguration cassandraConfiguration = CassandraConfiguration.builder()
+ .blobPartSize(CHUNK_SIZE)
+ .optimisticConsistencyLevel(true)
+ .build();
+ MetricFactory metricFactory = metricsTestExtension.getMetricFactory();
+ testee = new MetricableBlobStore(
+ metricFactory,
+ BlobStoreFactory.builder()
+ .blobStoreDAO(new CassandraBlobStoreDAO(defaultBucketDAO, bucketDAO, cassandraConfiguration, BucketName.DEFAULT, metricFactory))
+ .blobIdFactory(blobIdFactory)
+ .defaultBucketName()
+ .deduplication());
+ }
+
+ @Override
+ public BlobStore testee() {
+ return testee;
+ }
+
+ @Override
+ public BlobId.Factory blobIdFactory() {
+ return new HashBlobId.Factory();
+ }
+
+ @Override
+ public CassandraDefaultBucketDAO defaultBucketDAO() {
+ return defaultBucketDAO;
+ }
+
+ @Override
+ @Test
+ public void readShouldNotReturnInvalidResultsWhenPartialDataPresent() {
+ int repeatCount = MULTIPLE_CHUNK_SIZE * CHUNK_SIZE;
+ String longString = Strings.repeat("0123456789\n", repeatCount);
+ BlobId blobId = Mono.from(testee().save(testee().getDefaultBucketName(), longString, LOW_COST)).block();
+
+ when(defaultBucketDAO().readPartClOne(blobId, 1)).thenReturn(Mono.empty());
+ when(defaultBucketDAO().readPart(blobId, 1)).thenReturn(Mono.empty());
+
+ assertThatThrownBy(() -> IOUtils.toString(testee().read(testee().getDefaultBucketName(), blobId), StandardCharsets.UTF_8))
+ .isInstanceOf(ObjectStoreException.class)
+ .hasMessageContaining("Missing blob part for blobId");
+ }
+
+ @Override
+ @Test
+ public void readBytesShouldNotReturnInvalidResultsWhenPartialDataPresent() {
+ int repeatCount = MULTIPLE_CHUNK_SIZE * CHUNK_SIZE;
+ String longString = Strings.repeat("0123456789\n", repeatCount);
+ BlobId blobId = Mono.from(testee().save(testee().getDefaultBucketName(), longString, LOW_COST)).block();
+
+ when(defaultBucketDAO().readPartClOne(blobId, 1)).thenReturn(Mono.empty());
+ when(defaultBucketDAO().readPart(blobId, 1)).thenReturn(Mono.empty());
+
+ assertThatThrownBy(() -> Mono.from(testee().readBytes(testee().getDefaultBucketName(), blobId)).block())
+ .isInstanceOf(ObjectStoreException.class)
+ .hasMessageContaining("Missing blob part for blobId");
Review comment:
No then we should fallback to CL QUORUM...
--
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:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org
[GitHub] [james-project] chibenwa commented on a change in pull request #436: JAMES-3586 CL one option for the Cassandra blob store
Posted by GitBox <gi...@apache.org>.
chibenwa commented on a change in pull request #436:
URL: https://github.com/apache/james-project/pull/436#discussion_r635050634
##########
File path: server/blob/blob-cassandra/src/main/java/org/apache/james/blob/cassandra/CassandraBucketDAO.java
##########
@@ -154,6 +164,16 @@ private PreparedStatement prepareInsertPart(Session session) {
.map(this::rowToData);
}
+ Mono<ByteBuffer> readPartClOne(BucketName bucketName, BlobId blobId, int position) {
+ return cassandraAsyncExecutor.executeSingleRow(
+ selectPart.bind()
+ .setString(BucketBlobParts.BUCKET, bucketName.asString())
+ .setString(BucketBlobParts.ID, blobId.asString())
+ .setInt(BucketBlobParts.CHUNK_NUMBER, position)
+ .setConsistencyLevel(ONE))
Review comment:
Use LOCAL_ONE (here and elsewhere)
--
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:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org
[GitHub] [james-project] Arsnael merged pull request #436: JAMES-3586 CL one option for the Cassandra blob store
Posted by GitBox <gi...@apache.org>.
Arsnael merged pull request #436:
URL: https://github.com/apache/james-project/pull/436
--
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:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org
[GitHub] [james-project] Arsnael commented on a change in pull request #436: JAMES-3586 CL one option for the Cassandra blob store
Posted by GitBox <gi...@apache.org>.
Arsnael commented on a change in pull request #436:
URL: https://github.com/apache/james-project/pull/436#discussion_r634217282
##########
File path: server/blob/blob-cassandra/src/test/java/org/apache/james/blob/cassandra/CassandraBlobStoreClOneTest.java
##########
@@ -0,0 +1,216 @@
+package org.apache.james.blob.cassandra;
+
+import static org.apache.james.blob.api.BlobStore.StoragePolicy.LOW_COST;
+import static org.apache.james.blob.cassandra.CassandraBlobStoreDAO.CASSANDRA_BLOBSTORE_CL_ONE_HIT_COUNT_METRIC_NAME;
+import static org.apache.james.blob.cassandra.CassandraBlobStoreDAO.CASSANDRA_BLOBSTORE_CL_ONE_MISS_COUNT_METRIC_NAME;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.awaitility.Awaitility.await;
+import static org.awaitility.Durations.FIVE_SECONDS;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+
+import org.apache.commons.io.IOUtils;
+import org.apache.james.backends.cassandra.CassandraCluster;
+import org.apache.james.backends.cassandra.CassandraClusterExtension;
+import org.apache.james.backends.cassandra.init.configuration.CassandraConfiguration;
+import org.apache.james.blob.api.BlobId;
+import org.apache.james.blob.api.BlobStore;
+import org.apache.james.blob.api.BucketName;
+import org.apache.james.blob.api.HashBlobId;
+import org.apache.james.blob.api.MetricableBlobStore;
+import org.apache.james.blob.api.ObjectStoreException;
+import org.apache.james.metrics.api.MetricFactory;
+import org.apache.james.server.blob.deduplication.BlobStoreFactory;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import com.google.common.base.Strings;
+
+import reactor.core.publisher.Mono;
+
+class CassandraBlobStoreClOneTest implements CassandraBlobStoreContract {
+ @RegisterExtension
+ static CassandraClusterExtension cassandraCluster = new CassandraClusterExtension(CassandraBlobModule.MODULE);
+
+ private BlobStore testee;
+ private CassandraDefaultBucketDAO defaultBucketDAO;
+
+ @BeforeEach
+ void setUp(CassandraCluster cassandra) {
+ HashBlobId.Factory blobIdFactory = new HashBlobId.Factory();
+ CassandraBucketDAO bucketDAO = new CassandraBucketDAO(blobIdFactory, cassandra.getConf());
+ defaultBucketDAO = spy(new CassandraDefaultBucketDAO(cassandra.getConf()));
+ CassandraConfiguration cassandraConfiguration = CassandraConfiguration.builder()
+ .blobPartSize(CHUNK_SIZE)
+ .optimisticConsistencyLevel(true)
+ .build();
+ MetricFactory metricFactory = metricsTestExtension.getMetricFactory();
+ testee = new MetricableBlobStore(
+ metricFactory,
+ BlobStoreFactory.builder()
+ .blobStoreDAO(new CassandraBlobStoreDAO(defaultBucketDAO, bucketDAO, cassandraConfiguration, BucketName.DEFAULT, metricFactory))
+ .blobIdFactory(blobIdFactory)
+ .defaultBucketName()
+ .deduplication());
+ }
+
+ @Override
+ public BlobStore testee() {
+ return testee;
+ }
+
+ @Override
+ public BlobId.Factory blobIdFactory() {
+ return new HashBlobId.Factory();
+ }
+
+ @Override
+ public CassandraDefaultBucketDAO defaultBucketDAO() {
+ return defaultBucketDAO;
+ }
+
+ @Override
+ @Test
+ public void readShouldNotReturnInvalidResultsWhenPartialDataPresent() {
+ int repeatCount = MULTIPLE_CHUNK_SIZE * CHUNK_SIZE;
+ String longString = Strings.repeat("0123456789\n", repeatCount);
+ BlobId blobId = Mono.from(testee().save(testee().getDefaultBucketName(), longString, LOW_COST)).block();
+
+ when(defaultBucketDAO().readPartClOne(blobId, 1)).thenReturn(Mono.empty());
+ when(defaultBucketDAO().readPart(blobId, 1)).thenReturn(Mono.empty());
+
+ assertThatThrownBy(() -> IOUtils.toString(testee().read(testee().getDefaultBucketName(), blobId), StandardCharsets.UTF_8))
+ .isInstanceOf(ObjectStoreException.class)
+ .hasMessageContaining("Missing blob part for blobId");
Review comment:
Read above the when and you will see that I miss with quorum too. It's an override just to keep the test behavior and make it pass. The test you are talking about is below
##########
File path: server/blob/blob-cassandra/src/test/java/org/apache/james/blob/cassandra/CassandraBlobStoreClOneTest.java
##########
@@ -0,0 +1,216 @@
+package org.apache.james.blob.cassandra;
+
+import static org.apache.james.blob.api.BlobStore.StoragePolicy.LOW_COST;
+import static org.apache.james.blob.cassandra.CassandraBlobStoreDAO.CASSANDRA_BLOBSTORE_CL_ONE_HIT_COUNT_METRIC_NAME;
+import static org.apache.james.blob.cassandra.CassandraBlobStoreDAO.CASSANDRA_BLOBSTORE_CL_ONE_MISS_COUNT_METRIC_NAME;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.awaitility.Awaitility.await;
+import static org.awaitility.Durations.FIVE_SECONDS;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+
+import org.apache.commons.io.IOUtils;
+import org.apache.james.backends.cassandra.CassandraCluster;
+import org.apache.james.backends.cassandra.CassandraClusterExtension;
+import org.apache.james.backends.cassandra.init.configuration.CassandraConfiguration;
+import org.apache.james.blob.api.BlobId;
+import org.apache.james.blob.api.BlobStore;
+import org.apache.james.blob.api.BucketName;
+import org.apache.james.blob.api.HashBlobId;
+import org.apache.james.blob.api.MetricableBlobStore;
+import org.apache.james.blob.api.ObjectStoreException;
+import org.apache.james.metrics.api.MetricFactory;
+import org.apache.james.server.blob.deduplication.BlobStoreFactory;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import com.google.common.base.Strings;
+
+import reactor.core.publisher.Mono;
+
+class CassandraBlobStoreClOneTest implements CassandraBlobStoreContract {
+ @RegisterExtension
+ static CassandraClusterExtension cassandraCluster = new CassandraClusterExtension(CassandraBlobModule.MODULE);
+
+ private BlobStore testee;
+ private CassandraDefaultBucketDAO defaultBucketDAO;
+
+ @BeforeEach
+ void setUp(CassandraCluster cassandra) {
+ HashBlobId.Factory blobIdFactory = new HashBlobId.Factory();
+ CassandraBucketDAO bucketDAO = new CassandraBucketDAO(blobIdFactory, cassandra.getConf());
+ defaultBucketDAO = spy(new CassandraDefaultBucketDAO(cassandra.getConf()));
+ CassandraConfiguration cassandraConfiguration = CassandraConfiguration.builder()
+ .blobPartSize(CHUNK_SIZE)
+ .optimisticConsistencyLevel(true)
+ .build();
+ MetricFactory metricFactory = metricsTestExtension.getMetricFactory();
+ testee = new MetricableBlobStore(
+ metricFactory,
+ BlobStoreFactory.builder()
+ .blobStoreDAO(new CassandraBlobStoreDAO(defaultBucketDAO, bucketDAO, cassandraConfiguration, BucketName.DEFAULT, metricFactory))
+ .blobIdFactory(blobIdFactory)
+ .defaultBucketName()
+ .deduplication());
+ }
+
+ @Override
+ public BlobStore testee() {
+ return testee;
+ }
+
+ @Override
+ public BlobId.Factory blobIdFactory() {
+ return new HashBlobId.Factory();
+ }
+
+ @Override
+ public CassandraDefaultBucketDAO defaultBucketDAO() {
+ return defaultBucketDAO;
+ }
+
+ @Override
+ @Test
+ public void readShouldNotReturnInvalidResultsWhenPartialDataPresent() {
+ int repeatCount = MULTIPLE_CHUNK_SIZE * CHUNK_SIZE;
+ String longString = Strings.repeat("0123456789\n", repeatCount);
+ BlobId blobId = Mono.from(testee().save(testee().getDefaultBucketName(), longString, LOW_COST)).block();
+
+ when(defaultBucketDAO().readPartClOne(blobId, 1)).thenReturn(Mono.empty());
+ when(defaultBucketDAO().readPart(blobId, 1)).thenReturn(Mono.empty());
+
+ assertThatThrownBy(() -> IOUtils.toString(testee().read(testee().getDefaultBucketName(), blobId), StandardCharsets.UTF_8))
+ .isInstanceOf(ObjectStoreException.class)
+ .hasMessageContaining("Missing blob part for blobId");
+ }
+
+ @Override
+ @Test
+ public void readBytesShouldNotReturnInvalidResultsWhenPartialDataPresent() {
+ int repeatCount = MULTIPLE_CHUNK_SIZE * CHUNK_SIZE;
+ String longString = Strings.repeat("0123456789\n", repeatCount);
+ BlobId blobId = Mono.from(testee().save(testee().getDefaultBucketName(), longString, LOW_COST)).block();
+
+ when(defaultBucketDAO().readPartClOne(blobId, 1)).thenReturn(Mono.empty());
+ when(defaultBucketDAO().readPart(blobId, 1)).thenReturn(Mono.empty());
+
+ assertThatThrownBy(() -> Mono.from(testee().readBytes(testee().getDefaultBucketName(), blobId)).block())
+ .isInstanceOf(ObjectStoreException.class)
+ .hasMessageContaining("Missing blob part for blobId");
Review comment:
idem as above
--
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:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org
[GitHub] [james-project] chibenwa commented on a change in pull request #436: JAMES-3586 CL one option for the Cassandra blob store
Posted by GitBox <gi...@apache.org>.
chibenwa commented on a change in pull request #436:
URL: https://github.com/apache/james-project/pull/436#discussion_r634220691
##########
File path: server/blob/blob-cassandra/src/main/java/org/apache/james/blob/cassandra/CassandraBlobStoreDAO.java
##########
@@ -166,6 +166,23 @@ private boolean isDefaultBucket(BucketName bucketName) {
}
private Mono<ByteBuffer> readPart(BucketName bucketName, BlobId blobId, Integer partIndex) {
+ if (configuration.isOptimisticConsistencyLevel()) {
+ return readPartClOne(bucketName, blobId, partIndex)
Review comment:
ReadPart is the most critical.
--
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:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org