Durability Deadlock

Author: belliottsmith

.gitmodules

@@ -1,4 +1,4 @@
 [submodule "modules/accord"]
 	path = modules/accord
-	url = https://github.com/apache/cassandra-accord.git
-	branch = trunk
+	url = https://github.com/belliottsmith/cassandra-accord.git
+	branch = durability-deadlock

modules/accord

@@ -2111,7 +2111,7 @@ protected void collect(PartitionsCollector collector)
                     DebugBlockedTxns.visit(AccordService.unsafeInstance(), txnId, maxDepth, collector.deadlineNanos(), txn -> {
                         String keyStr = txn.blockedViaKey == null ? "" : txn.blockedViaKey.toString();
                         String txnIdStr = txn.txnId == null || txn.txnId.equals(txnId) ? "" : txn.txnId.toString();
-                        rows.add(txn.commandStoreId, txn.depth, keyStr, txnIdStr)
+                        rows.add(txn.depth, txn.commandStoreId, txnIdStr, keyStr)
                             .eagerCollect(columns -> {
                                 columns.add("save_status", txn.saveStatus, TO_STRING)
                                        .add("execute_at", txn.executeAt, TO_STRING);
@@ -2160,8 +2160,9 @@ private ShardEpochsTable()
                         "  quorum_fast_privileged_deps int,\n" +
                         "  quorum_fast_privileged_nodeps int,\n" +
                         "  token_end 'TokenUtf8Type',\n" +
-                        "  PRIMARY KEY (table_id, token_start, epoch_start DESC)" +
-                        ')', UTF8Type.instance), FAIL, ASC);
+                        "  PRIMARY KEY (table_id, token_start, epoch_start))," +
+                        "  WITH CLUSTERING ORDER BY (token_start, epoch_start DESC)"
+                        , UTF8Type.instance), FAIL, ASC);
         }
 
         @Override

src/java/org/apache/cassandra/db/virtual/AccordDebugKeyspace.java

@@ -643,15 +643,15 @@ public void blocked() throws ExecutionException, InterruptedException
                                               return rs.size() == 2;
                                           });
             assertRows(execute(QUERY_TXN_BLOCKED_BY, second.toString()),
-                       row(second.toString(), anyInt(), 0, "", "", anyNonNull(), SaveStatus.Stable.name()),
-                       row(second.toString(), anyInt(), 1, any(), first.toString(), anyNonNull(), SaveStatus.ReadyToExecute.name()));
+                       row(second.toString(), 0, anyInt(), "", "", anyNonNull(), SaveStatus.Stable.name()),
+                       row(second.toString(), 1, anyInt(), first.toString(), any(), anyNonNull(), SaveStatus.ReadyToExecute.name()));
             assertRows(execute(QUERY_TXN_BLOCKED_BY + " AND depth < 1", second.toString()),
-                       row(second.toString(), anyInt(), 0, any(), "", anyNonNull(), SaveStatus.Stable.name()));
+                       row(second.toString(), 0, anyInt(), "", any(), anyNonNull(), SaveStatus.Stable.name()));
             assertRows(execute(QUERY_TXN_BLOCKED_BY_REMOTE, nodeId, second.toString()),
-                       row(nodeId, second.toString(), anyInt(), 0, "", "", anyNonNull(), SaveStatus.Stable.name()),
-                       row(nodeId, second.toString(), anyInt(), 1, any(), first.toString(), anyNonNull(), SaveStatus.ReadyToExecute.name()));
+                       row(nodeId, second.toString(), 0, anyInt(), "", "", anyNonNull(), SaveStatus.Stable.name()),
+                       row(nodeId, second.toString(), 1, anyInt(), first.toString(), any(), anyNonNull(), SaveStatus.ReadyToExecute.name()));
             assertRows(execute(QUERY_TXN_BLOCKED_BY_REMOTE + " AND depth < 1", nodeId, second.toString()),
-                       row(nodeId, second.toString(), anyInt(), 0, any(), "", anyNonNull(), SaveStatus.Stable.name()));
+                       row(nodeId, second.toString(), 0, anyInt(), "", any(), anyNonNull(), SaveStatus.Stable.name()));
         }
         finally
         {