You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aurora.apache.org by ma...@apache.org on 2014/09/10 01:40:14 UTC

git commit: Transaction all SQL under MemStorage

Repository: incubator-aurora
Updated Branches:
  refs/heads/master e4bd59f3a -> a2ce06ec0


Transaction all SQL under MemStorage

Bugs closed: AURORA-694

Reviewed at https://reviews.apache.org/r/25483/


Project: http://git-wip-us.apache.org/repos/asf/incubator-aurora/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-aurora/commit/a2ce06ec
Tree: http://git-wip-us.apache.org/repos/asf/incubator-aurora/tree/a2ce06ec
Diff: http://git-wip-us.apache.org/repos/asf/incubator-aurora/diff/a2ce06ec

Branch: refs/heads/master
Commit: a2ce06ec0ef5a0c47e0cee6fcf323387791da214
Parents: e4bd59f
Author: Zameer Manji <zm...@twopensource.com>
Authored: Tue Sep 9 16:12:27 2014 -0700
Committer: Maxim Khutornenko <ma...@apache.org>
Committed: Tue Sep 9 16:12:27 2014 -0700

----------------------------------------------------------------------
 .../scheduler/storage/mem/MemStorage.java       | 29 ++++++++++++++----
 .../scheduler/storage/mem/MemStorageTest.java   | 32 ++++++++++++++++++++
 2 files changed, 55 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/a2ce06ec/src/main/java/org/apache/aurora/scheduler/storage/mem/MemStorage.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/storage/mem/MemStorage.java b/src/main/java/org/apache/aurora/scheduler/storage/mem/MemStorage.java
index d7d350e..186bc46 100644
--- a/src/main/java/org/apache/aurora/scheduler/storage/mem/MemStorage.java
+++ b/src/main/java/org/apache/aurora/scheduler/storage/mem/MemStorage.java
@@ -182,13 +182,24 @@ public class MemStorage implements Storage {
   }
 
   @Override
-  public <T, E extends Exception> T consistentRead(Work<T, E> work) throws StorageException, E {
-    return doWork(LockType.READ, storeProvider, work, readStats, readLockWaitNanos);
+  public <T, E extends Exception> T consistentRead(final Work<T, E> work)
+          throws StorageException, E {
+    return delegatedStore.consistentRead(new Work<T, E>() {
+      @Override
+      public T apply(StoreProvider provider) throws E {
+        return doWork(LockType.READ, storeProvider, work, readStats, readLockWaitNanos);
+      }
+    });
   }
 
   @Override
-  public <T, E extends Exception> T write(MutateWork<T, E> work) throws StorageException, E {
-    return doWork(LockType.WRITE, storeProvider, work, writeStats, writeLockWaitNanos);
+  public <T, E extends Exception> T write(final MutateWork<T, E> work) throws StorageException, E {
+    return delegatedStore.write(new MutateWork<T, E>() {
+      @Override
+      public T apply(MutableStoreProvider provider) throws E {
+       return doWork(LockType.WRITE, storeProvider, work, writeStats, writeLockWaitNanos);
+      }
+    });
   }
 
   @Override
@@ -198,9 +209,15 @@ public class MemStorage implements Storage {
 
   @Timed("mem_storage_weakly_consistent_read_operation")
   @Override
-  public <T, E extends Exception> T weaklyConsistentRead(Work<T, E> work)
+  public <T, E extends Exception> T weaklyConsistentRead(final Work<T, E> work)
       throws StorageException, E {
 
-    return work.apply(storeProvider);
+    return delegatedStore.weaklyConsistentRead(new Work<T, E>() {
+      @Override
+      public T apply(StoreProvider provider) throws E {
+        return work.apply(storeProvider);
+      }
+    });
+
   }
 }

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/a2ce06ec/src/test/java/org/apache/aurora/scheduler/storage/mem/MemStorageTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/storage/mem/MemStorageTest.java b/src/test/java/org/apache/aurora/scheduler/storage/mem/MemStorageTest.java
index a042fa9..abf6868 100644
--- a/src/test/java/org/apache/aurora/scheduler/storage/mem/MemStorageTest.java
+++ b/src/test/java/org/apache/aurora/scheduler/storage/mem/MemStorageTest.java
@@ -21,6 +21,7 @@ import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 
 import com.google.common.collect.FluentIterable;
+import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Iterables;
 import com.google.common.testing.TearDown;
@@ -32,6 +33,7 @@ import com.twitter.common.util.concurrent.ExecutorServiceShutdown;
 
 import org.apache.aurora.gen.AssignedTask;
 import org.apache.aurora.gen.Identity;
+import org.apache.aurora.gen.ResourceAggregate;
 import org.apache.aurora.gen.ScheduledTask;
 import org.apache.aurora.gen.TaskConfig;
 import org.apache.aurora.scheduler.base.Query;
@@ -41,6 +43,7 @@ import org.apache.aurora.scheduler.storage.Storage.MutableStoreProvider;
 import org.apache.aurora.scheduler.storage.Storage.MutateWork;
 import org.apache.aurora.scheduler.storage.Storage.StoreProvider;
 import org.apache.aurora.scheduler.storage.Storage.Work;
+import org.apache.aurora.scheduler.storage.entities.IResourceAggregate;
 import org.apache.aurora.scheduler.storage.entities.IScheduledTask;
 import org.junit.Before;
 import org.junit.Test;
@@ -144,6 +147,35 @@ public class MemStorageTest extends TearDownTestCase {
   }
 
   @Test
+  public void testWritesUnderTransaction() {
+    final IResourceAggregate quota = IResourceAggregate
+            .build(new ResourceAggregate().setDiskMb(100).setNumCpus(2.0).setRamMb(512));
+
+    try {
+      storage.write(new MutateWork.NoResult.Quiet() {
+        @Override
+        protected void execute(MutableStoreProvider storeProvider) {
+          storeProvider.getQuotaStore().saveQuota("a", quota);
+          throw new CustomException();
+        }
+      });
+      fail("Expected CustomException to be thrown.");
+    } catch (CustomException e) {
+      // Expected
+    }
+
+    storage.consistentRead(new Work.Quiet<Void>() {
+      @Override
+      public Void apply(StoreProvider storeProvider) {
+        // If the previous write was under a transaction then there would be no quota records.
+        assertEquals(ImmutableMap.<String, IResourceAggregate>of(),
+                storeProvider.getQuotaStore().fetchQuotas());
+        return null;
+      }
+    });
+  }
+
+  @Test
   public void testOperations() {
     expectWriteFail(new MutateWork.NoResult.Quiet() {
       @Override