Author: adulceanu
Date: Thu Aug 15 12:22:01 2019
New Revision: 1865219
URL: http://svn.apache.org/viewvc?rev=1865219&view=rev
Log:
OAK-8531 - Reading Azure Journal File while it's modified fails
Added test case
Added:
jackrabbit/oak/trunk/oak-segment-azure/src/test/java/org/apache/jackrabbit/oak/segment/azure/AzureJournalFileConcurrencyIT.java
(with props)
Added:
jackrabbit/oak/trunk/oak-segment-azure/src/test/java/org/apache/jackrabbit/oak/segment/azure/AzureJournalFileConcurrencyIT.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-azure/src/test/java/org/apache/jackrabbit/oak/segment/azure/AzureJournalFileConcurrencyIT.java?rev=1865219&view=auto
==============================================================================
---
jackrabbit/oak/trunk/oak-segment-azure/src/test/java/org/apache/jackrabbit/oak/segment/azure/AzureJournalFileConcurrencyIT.java
(added)
+++
jackrabbit/oak/trunk/oak-segment-azure/src/test/java/org/apache/jackrabbit/oak/segment/azure/AzureJournalFileConcurrencyIT.java
Thu Aug 15 12:22:01 2019
@@ -0,0 +1,139 @@
+/*
+ * 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.jackrabbit.oak.segment.azure;
+
+import com.microsoft.azure.storage.CloudStorageAccount;
+import com.microsoft.azure.storage.StorageException;
+import com.microsoft.azure.storage.blob.CloudBlobClient;
+import com.microsoft.azure.storage.blob.CloudBlobContainer;
+
+import org.apache.jackrabbit.oak.segment.spi.persistence.JournalFile;
+import org.apache.jackrabbit.oak.segment.spi.persistence.JournalFileReader;
+import org.apache.jackrabbit.oak.segment.spi.persistence.JournalFileWriter;
+import org.junit.AfterClass;
+import org.junit.Assume;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.security.InvalidKeyException;
+import java.util.UUID;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicReference;
+
+public class AzureJournalFileConcurrencyIT {
+ private static final Logger log =
LoggerFactory.getLogger(AzureJournalFileConcurrencyIT.class);
+
+ private static CloudBlobContainer container;
+
+ private static int suffix;
+
+ private AzurePersistence persistence;
+
+ @BeforeClass
+ public static void connectToAzure() throws URISyntaxException,
InvalidKeyException, StorageException {
+ String azureConnectionString = System.getenv("AZURE_CONNECTION");
+ Assume.assumeNotNull(azureConnectionString);
+ CloudBlobClient client =
CloudStorageAccount.parse(azureConnectionString).createCloudBlobClient();
+ container = client.getContainerReference("oak-test-" +
System.currentTimeMillis());
+ container.createIfNotExists();
+ suffix = 1;
+ }
+
+ @Before
+ public void setup() throws StorageException, InvalidKeyException,
URISyntaxException, IOException, InterruptedException {
+ persistence = new
AzurePersistence(container.getDirectoryReference("oak-" + (suffix++)));
+ writeJournalLines(300, 0);
+ log.info("Finished writing initial content to journal!");
+ }
+
+ @AfterClass
+ public static void cleanupContainer() throws StorageException {
+ if (container != null) {
+ container.deleteIfExists();
+ }
+ }
+
+ @Test
+ public void testConcurrency() throws Exception {
+ AtomicBoolean stop = new AtomicBoolean();
+ AtomicReference<Exception> exContainer = new AtomicReference<>();
+
+ Thread producer = new Thread(() -> {
+ try {
+ while (!stop.get()) {
+ writeJournalLines(300, 100);
+ }
+ } catch(Exception e) {
+ exContainer.set(e);
+ stop.set(true);
+ }
+ });
+
+ Thread consumer = new Thread(() -> {
+ try {
+ while (!stop.get()) {
+ readJournal();
+ }
+ } catch (IOException e) {
+ exContainer.set(e);
+ stop.set(true);
+ }
+ });
+
+ producer.start();
+ consumer.start();
+
+ long start = System.currentTimeMillis();
+ while (System.currentTimeMillis() - start < 30_000 && !stop.get()) {
+ Thread.sleep(100);
+ }
+ stop.set(true);
+
+ producer.join();
+ consumer.join();
+
+ if (exContainer.get() != null) {
+ throw exContainer.get();
+ }
+ }
+
+ private void readJournal() throws IOException {
+ JournalFile file = persistence.getJournalFile();
+ try (JournalFileReader reader = file.openJournalReader()) {
+ String line = null;
+ while ((line = reader.readLine()) != null) {
+ log.info(line);
+ }
+ }
+ }
+
+ private void writeJournalLines(int lines, int delayMillis) throws
IOException, InterruptedException {
+ JournalFile file = persistence.getJournalFile();
+ try (JournalFileWriter writer = file.openJournalWriter()) {
+ for (int i = 0; i < lines; i++) {
+ writer.writeLine(String.format("%4X - %s", i,
UUID.randomUUID().toString()));
+ Thread.sleep(delayMillis);
+ }
+ }
+ }
+
+}
\ No newline at end of file
Propchange:
jackrabbit/oak/trunk/oak-segment-azure/src/test/java/org/apache/jackrabbit/oak/segment/azure/AzureJournalFileConcurrencyIT.java
------------------------------------------------------------------------------
svn:eol-style = native
