| commit | b5d4f56ae427351a282af4c8d740d8b91d21f80f | [log] [tgz] |
|---|---|---|
| author | Abdullah Alamoudi <bamousaa@gmail.com> | Fri Jul 28 10:41:40 2017 -0700 |
| committer | abdullah alamoudi <bamousaa@gmail.com> | Fri Jul 28 14:54:11 2017 -0700 |
| tree | f5f69fdaa0e524a9e01fe5edb79c010dc5960a86 | |
| parent | 58be3a8e40caf430982e26a58284f9c6df41836e [diff] |
[ASTERIXDB-2006][TX] Fix metadata lock containment rules - user model changes: no - storage format changes: no - interface changes: no Details: - Locks with mode exclusive modify cover all modify modes Change-Id: Ib0ecbaed86370707d560b7d0c3e6933c198aab41 Reviewed-on: https://asterix-gerrit.ics.uci.edu/1907 Sonar-Qube: Jenkins <jenkins@fulliautomatix.ics.uci.edu> Tested-by: Jenkins <jenkins@fulliautomatix.ics.uci.edu> BAD: Jenkins <jenkins@fulliautomatix.ics.uci.edu> Reviewed-by: Till Westmann <tillw@apache.org> Integration-Tests: Jenkins <jenkins@fulliautomatix.ics.uci.edu>
diff --git a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/metadata/IMetadataLock.java b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/metadata/IMetadataLock.java index ba17b0c..ebae47e 100644 --- a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/metadata/IMetadataLock.java +++ b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/metadata/IMetadataLock.java
@@ -39,7 +39,10 @@ if (mode == this) { return true; } - if (this == Mode.WRITE) { + if (this == Mode.WRITE || this == Mode.UPGRADED_WRITE) { + return true; + } + if (this == Mode.EXCLUSIVE_MODIFY && (mode == Mode.MODIFY || mode == Mode.INDEX_BUILD)) { return true; } return mode == Mode.READ;