You are viewing a plain text version of this content. The canonical link for it is here.
Posted to pr@cassandra.apache.org by "ifesdjeen (via GitHub)" <gi...@apache.org> on 2024/07/08 10:04:21 UTC
[PR] Bring back Journal simulator (w/o Accord at least for now); add semap… [cassandra]
ifesdjeen opened a new pull request, #3408:
URL: https://github.com/apache/cassandra/pull/3408
…hore interceptor.
--
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.
To unsubscribe, e-mail: pr-unsubscribe@cassandra.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: pr-unsubscribe@cassandra.apache.org
For additional commands, e-mail: pr-help@cassandra.apache.org
Re: [PR] Bring back Journal simulator (w/o Accord at least for now); add semap… [cassandra]
Posted by "dcapwell (via GitHub)" <gi...@apache.org>.
dcapwell commented on code in PR #3408:
URL: https://github.com/apache/cassandra/pull/3408#discussion_r1670779951
##########
test/simulator/main/org/apache/cassandra/simulator/systems/InterceptingSemaphore.java:
##########
@@ -0,0 +1,180 @@
+/*
+ * 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.cassandra.simulator.systems;
+
+import java.util.Queue;
+import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import org.apache.cassandra.utils.concurrent.Semaphore;
+import org.apache.cassandra.utils.concurrent.UncheckedInterruptedException;
+
+import static org.apache.cassandra.simulator.systems.InterceptorOfGlobalMethods.Global.ifIntercepted;
+
+public class InterceptingSemaphore extends Semaphore.Standard
+{
+ final Queue<SemaphoreSignal> interceptible = new ConcurrentLinkedQueue<>();
+ final AtomicInteger permits;
+ final boolean fair;
+
+ private static class SemaphoreSignal extends InterceptingAwaitable.InterceptingSignal<Void>
+ {
+ private final int permits;
+
+ private SemaphoreSignal(int permits)
+ {
+ this.permits = permits;
+ }
+ }
+
+ public InterceptingSemaphore(int permits, boolean fair)
+ {
+ super(permits);
+ this.permits = new AtomicInteger(permits);
+ this.fair = fair;
+ }
+
+ @Override
+ public int permits()
+ {
+ if (ifIntercepted() == null)
+ return super.permits();
+
+ return permits.get();
+ }
+
+ @Override
+ public int drain()
+ {
+ if (ifIntercepted() == null)
+ return super.permits();
+
+ int current = permits.get();
+ boolean res = permits.compareAndSet(current, 0);
+ assert res;
+ return current;
+ }
+
+ @Override
+ public void release(int release)
+ {
+ if (ifIntercepted() == null)
+ {
+ super.release();
Review Comment:
```suggestion
super.release(release);
```
##########
test/simulator/main/org/apache/cassandra/simulator/systems/InterceptingSemaphore.java:
##########
@@ -0,0 +1,180 @@
+/*
+ * 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.cassandra.simulator.systems;
+
+import java.util.Queue;
+import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import org.apache.cassandra.utils.concurrent.Semaphore;
+import org.apache.cassandra.utils.concurrent.UncheckedInterruptedException;
+
+import static org.apache.cassandra.simulator.systems.InterceptorOfGlobalMethods.Global.ifIntercepted;
+
+public class InterceptingSemaphore extends Semaphore.Standard
+{
+ final Queue<SemaphoreSignal> interceptible = new ConcurrentLinkedQueue<>();
+ final AtomicInteger permits;
+ final boolean fair;
+
+ private static class SemaphoreSignal extends InterceptingAwaitable.InterceptingSignal<Void>
+ {
+ private final int permits;
+
+ private SemaphoreSignal(int permits)
+ {
+ this.permits = permits;
+ }
+ }
+
+ public InterceptingSemaphore(int permits, boolean fair)
+ {
+ super(permits);
+ this.permits = new AtomicInteger(permits);
+ this.fair = fair;
+ }
+
+ @Override
+ public int permits()
+ {
+ if (ifIntercepted() == null)
+ return super.permits();
+
+ return permits.get();
+ }
+
+ @Override
+ public int drain()
+ {
+ if (ifIntercepted() == null)
+ return super.permits();
+
+ int current = permits.get();
+ boolean res = permits.compareAndSet(current, 0);
+ assert res;
+ return current;
+ }
+
+ @Override
+ public void release(int release)
+ {
+ if (ifIntercepted() == null)
+ {
+ super.release();
+ return;
+ }
+
+ int current = permits.get();
+ permits.compareAndSet(current, current + release);
+ int remaining = permits.get();
Review Comment:
```suggestion
int remaining = permits.addAndGet(release);
```
##########
test/simulator/main/org/apache/cassandra/simulator/systems/InterceptingSemaphore.java:
##########
@@ -0,0 +1,180 @@
+/*
+ * 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.cassandra.simulator.systems;
+
+import java.util.Queue;
+import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import org.apache.cassandra.utils.concurrent.Semaphore;
+import org.apache.cassandra.utils.concurrent.UncheckedInterruptedException;
+
+import static org.apache.cassandra.simulator.systems.InterceptorOfGlobalMethods.Global.ifIntercepted;
+
+public class InterceptingSemaphore extends Semaphore.Standard
+{
+ final Queue<SemaphoreSignal> interceptible = new ConcurrentLinkedQueue<>();
+ final AtomicInteger permits;
+ final boolean fair;
+
+ private static class SemaphoreSignal extends InterceptingAwaitable.InterceptingSignal<Void>
+ {
+ private final int permits;
+
+ private SemaphoreSignal(int permits)
+ {
+ this.permits = permits;
+ }
+ }
+
+ public InterceptingSemaphore(int permits, boolean fair)
+ {
+ super(permits);
+ this.permits = new AtomicInteger(permits);
+ this.fair = fair;
+ }
+
+ @Override
+ public int permits()
+ {
+ if (ifIntercepted() == null)
+ return super.permits();
+
+ return permits.get();
+ }
+
+ @Override
+ public int drain()
+ {
+ if (ifIntercepted() == null)
+ return super.permits();
+
+ int current = permits.get();
+ boolean res = permits.compareAndSet(current, 0);
+ assert res;
+ return current;
+ }
+
+ @Override
+ public void release(int release)
+ {
+ if (ifIntercepted() == null)
+ {
+ super.release();
+ return;
+ }
+
+ int current = permits.get();
+ permits.compareAndSet(current, current + release);
+ int remaining = permits.get();
+ while (!interceptible.isEmpty() && remaining > 0)
+ {
+ SemaphoreSignal signal = interceptible.peek();
+ if (signal.permits >= remaining)
+ interceptible.poll().signal();
+ else if (fair)
+ // Do not break enqueue order if using fair scheduler
+ break;
+ }
+ }
+
+ @Override
+ public boolean tryAcquire(int acquire)
+ {
+ if (ifIntercepted() == null)
+ return super.tryAcquire(acquire);
+
+ int current = permits.get();
+ if (current >= acquire)
+ {
+ return permits.compareAndSet(current, current - acquire);
Review Comment:
no loop needed? We would enqueue even though we could have acquired?
##########
test/simulator/main/org/apache/cassandra/simulator/systems/InterceptingSemaphore.java:
##########
@@ -0,0 +1,180 @@
+/*
+ * 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.cassandra.simulator.systems;
+
+import java.util.Queue;
+import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import org.apache.cassandra.utils.concurrent.Semaphore;
+import org.apache.cassandra.utils.concurrent.UncheckedInterruptedException;
+
+import static org.apache.cassandra.simulator.systems.InterceptorOfGlobalMethods.Global.ifIntercepted;
+
+public class InterceptingSemaphore extends Semaphore.Standard
+{
+ final Queue<SemaphoreSignal> interceptible = new ConcurrentLinkedQueue<>();
+ final AtomicInteger permits;
+ final boolean fair;
+
+ private static class SemaphoreSignal extends InterceptingAwaitable.InterceptingSignal<Void>
+ {
+ private final int permits;
+
+ private SemaphoreSignal(int permits)
+ {
+ this.permits = permits;
+ }
+ }
+
+ public InterceptingSemaphore(int permits, boolean fair)
+ {
+ super(permits);
+ this.permits = new AtomicInteger(permits);
+ this.fair = fair;
+ }
+
+ @Override
+ public int permits()
+ {
+ if (ifIntercepted() == null)
+ return super.permits();
+
+ return permits.get();
+ }
+
+ @Override
+ public int drain()
+ {
+ if (ifIntercepted() == null)
+ return super.permits();
+
+ int current = permits.get();
+ boolean res = permits.compareAndSet(current, 0);
+ assert res;
+ return current;
+ }
+
+ @Override
+ public void release(int release)
+ {
+ if (ifIntercepted() == null)
+ {
+ super.release();
+ return;
+ }
+
+ int current = permits.get();
+ permits.compareAndSet(current, current + release);
+ int remaining = permits.get();
+ while (!interceptible.isEmpty() && remaining > 0)
+ {
+ SemaphoreSignal signal = interceptible.peek();
+ if (signal.permits >= remaining)
+ interceptible.poll().signal();
+ else if (fair)
+ // Do not break enqueue order if using fair scheduler
+ break;
+ }
+ }
+
+ @Override
+ public boolean tryAcquire(int acquire)
+ {
+ if (ifIntercepted() == null)
+ return super.tryAcquire(acquire);
+
+ int current = permits.get();
+ if (current >= acquire)
+ {
+ return permits.compareAndSet(current, current - acquire);
+ }
+ else
+ {
+ return false;
+ }
+ }
+
+ @Override
+ public boolean tryAcquire(int acquire, long time, TimeUnit unit) throws InterruptedException
+ {
+ if (ifIntercepted() == null)
+ return super.tryAcquire(acquire);
+
+ int current = permits.get();
+ if (current >= acquire)
+ return permits.compareAndSet(current, current - acquire);
Review Comment:
same as above, no loop needed?
##########
test/simulator/main/org/apache/cassandra/simulator/systems/InterceptingSemaphore.java:
##########
@@ -0,0 +1,180 @@
+/*
+ * 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.cassandra.simulator.systems;
+
+import java.util.Queue;
+import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import org.apache.cassandra.utils.concurrent.Semaphore;
+import org.apache.cassandra.utils.concurrent.UncheckedInterruptedException;
+
+import static org.apache.cassandra.simulator.systems.InterceptorOfGlobalMethods.Global.ifIntercepted;
+
+public class InterceptingSemaphore extends Semaphore.Standard
+{
+ final Queue<SemaphoreSignal> interceptible = new ConcurrentLinkedQueue<>();
+ final AtomicInteger permits;
+ final boolean fair;
+
+ private static class SemaphoreSignal extends InterceptingAwaitable.InterceptingSignal<Void>
+ {
+ private final int permits;
+
+ private SemaphoreSignal(int permits)
+ {
+ this.permits = permits;
+ }
+ }
+
+ public InterceptingSemaphore(int permits, boolean fair)
+ {
+ super(permits);
+ this.permits = new AtomicInteger(permits);
+ this.fair = fair;
+ }
+
+ @Override
+ public int permits()
+ {
+ if (ifIntercepted() == null)
+ return super.permits();
+
+ return permits.get();
+ }
+
+ @Override
+ public int drain()
+ {
+ if (ifIntercepted() == null)
+ return super.permits();
+
+ int current = permits.get();
+ boolean res = permits.compareAndSet(current, 0);
+ assert res;
+ return current;
+ }
+
+ @Override
+ public void release(int release)
+ {
+ if (ifIntercepted() == null)
+ {
+ super.release();
+ return;
+ }
+
+ int current = permits.get();
+ permits.compareAndSet(current, current + release);
+ int remaining = permits.get();
+ while (!interceptible.isEmpty() && remaining > 0)
+ {
+ SemaphoreSignal signal = interceptible.peek();
+ if (signal.permits >= remaining)
+ interceptible.poll().signal();
+ else if (fair)
+ // Do not break enqueue order if using fair scheduler
+ break;
+ }
+ }
+
+ @Override
+ public boolean tryAcquire(int acquire)
+ {
+ if (ifIntercepted() == null)
+ return super.tryAcquire(acquire);
+
+ int current = permits.get();
+ if (current >= acquire)
+ {
+ return permits.compareAndSet(current, current - acquire);
+ }
+ else
+ {
+ return false;
+ }
+ }
+
+ @Override
+ public boolean tryAcquire(int acquire, long time, TimeUnit unit) throws InterruptedException
+ {
+ if (ifIntercepted() == null)
+ return super.tryAcquire(acquire);
+
+ int current = permits.get();
+ if (current >= acquire)
+ return permits.compareAndSet(current, current - acquire);
+
+ SemaphoreSignal signal = new SemaphoreSignal(acquire);
+ interceptible.add(signal);
+ signal.await(time, unit);
+ return permits.compareAndSet(current, current - acquire);
+ }
+
+ @Override
+ public boolean tryAcquireUntil(int acquire, long nanoTimeDeadline) throws InterruptedException
+ {
+ if (ifIntercepted() == null)
+ return super.tryAcquireUntil(acquire, nanoTimeDeadline);
+
+ int current = permits.get();
+ if (current >= acquire)
+ return permits.compareAndSet(current, current - acquire);
Review Comment:
shouldn't this be a loop? if we fail to update because something else we *should* try again no?
##########
test/simulator/main/org/apache/cassandra/simulator/systems/InterceptingSemaphore.java:
##########
@@ -0,0 +1,180 @@
+/*
+ * 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.cassandra.simulator.systems;
+
+import java.util.Queue;
+import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import org.apache.cassandra.utils.concurrent.Semaphore;
+import org.apache.cassandra.utils.concurrent.UncheckedInterruptedException;
+
+import static org.apache.cassandra.simulator.systems.InterceptorOfGlobalMethods.Global.ifIntercepted;
+
+public class InterceptingSemaphore extends Semaphore.Standard
+{
+ final Queue<SemaphoreSignal> interceptible = new ConcurrentLinkedQueue<>();
+ final AtomicInteger permits;
+ final boolean fair;
+
+ private static class SemaphoreSignal extends InterceptingAwaitable.InterceptingSignal<Void>
+ {
+ private final int permits;
+
+ private SemaphoreSignal(int permits)
+ {
+ this.permits = permits;
+ }
+ }
+
+ public InterceptingSemaphore(int permits, boolean fair)
+ {
+ super(permits);
+ this.permits = new AtomicInteger(permits);
+ this.fair = fair;
+ }
+
+ @Override
+ public int permits()
+ {
+ if (ifIntercepted() == null)
+ return super.permits();
+
+ return permits.get();
+ }
+
+ @Override
+ public int drain()
+ {
+ if (ifIntercepted() == null)
+ return super.permits();
Review Comment:
```suggestion
return super.drain();
```
?
##########
test/simulator/main/org/apache/cassandra/simulator/systems/InterceptingSemaphore.java:
##########
@@ -0,0 +1,180 @@
+/*
+ * 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.cassandra.simulator.systems;
+
+import java.util.Queue;
+import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import org.apache.cassandra.utils.concurrent.Semaphore;
+import org.apache.cassandra.utils.concurrent.UncheckedInterruptedException;
+
+import static org.apache.cassandra.simulator.systems.InterceptorOfGlobalMethods.Global.ifIntercepted;
+
+public class InterceptingSemaphore extends Semaphore.Standard
+{
+ final Queue<SemaphoreSignal> interceptible = new ConcurrentLinkedQueue<>();
+ final AtomicInteger permits;
+ final boolean fair;
+
+ private static class SemaphoreSignal extends InterceptingAwaitable.InterceptingSignal<Void>
+ {
+ private final int permits;
+
+ private SemaphoreSignal(int permits)
+ {
+ this.permits = permits;
+ }
+ }
+
+ public InterceptingSemaphore(int permits, boolean fair)
+ {
+ super(permits);
+ this.permits = new AtomicInteger(permits);
+ this.fair = fair;
+ }
+
+ @Override
+ public int permits()
+ {
+ if (ifIntercepted() == null)
+ return super.permits();
+
+ return permits.get();
+ }
+
+ @Override
+ public int drain()
+ {
+ if (ifIntercepted() == null)
+ return super.permits();
+
+ int current = permits.get();
+ boolean res = permits.compareAndSet(current, 0);
+ assert res;
+ return current;
+ }
+
+ @Override
+ public void release(int release)
+ {
+ if (ifIntercepted() == null)
+ {
+ super.release();
+ return;
+ }
+
+ int current = permits.get();
+ permits.compareAndSet(current, current + release);
+ int remaining = permits.get();
+ while (!interceptible.isEmpty() && remaining > 0)
+ {
+ SemaphoreSignal signal = interceptible.peek();
+ if (signal.permits >= remaining)
+ interceptible.poll().signal();
+ else if (fair)
+ // Do not break enqueue order if using fair scheduler
+ break;
+ }
+ }
+
+ @Override
+ public boolean tryAcquire(int acquire)
+ {
+ if (ifIntercepted() == null)
+ return super.tryAcquire(acquire);
+
+ int current = permits.get();
+ if (current >= acquire)
+ {
+ return permits.compareAndSet(current, current - acquire);
+ }
+ else
+ {
+ return false;
+ }
+ }
+
+ @Override
+ public boolean tryAcquire(int acquire, long time, TimeUnit unit) throws InterruptedException
+ {
+ if (ifIntercepted() == null)
+ return super.tryAcquire(acquire);
Review Comment:
```suggestion
return super.tryAcquire(acquire, time, unit);
```
##########
test/simulator/main/org/apache/cassandra/simulator/systems/InterceptingSemaphore.java:
##########
@@ -0,0 +1,180 @@
+/*
+ * 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.cassandra.simulator.systems;
+
+import java.util.Queue;
+import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import org.apache.cassandra.utils.concurrent.Semaphore;
+import org.apache.cassandra.utils.concurrent.UncheckedInterruptedException;
+
+import static org.apache.cassandra.simulator.systems.InterceptorOfGlobalMethods.Global.ifIntercepted;
+
+public class InterceptingSemaphore extends Semaphore.Standard
+{
+ final Queue<SemaphoreSignal> interceptible = new ConcurrentLinkedQueue<>();
+ final AtomicInteger permits;
+ final boolean fair;
+
+ private static class SemaphoreSignal extends InterceptingAwaitable.InterceptingSignal<Void>
+ {
+ private final int permits;
+
+ private SemaphoreSignal(int permits)
+ {
+ this.permits = permits;
+ }
+ }
+
+ public InterceptingSemaphore(int permits, boolean fair)
+ {
+ super(permits);
+ this.permits = new AtomicInteger(permits);
+ this.fair = fair;
+ }
+
+ @Override
+ public int permits()
+ {
+ if (ifIntercepted() == null)
+ return super.permits();
+
+ return permits.get();
+ }
+
+ @Override
+ public int drain()
+ {
+ if (ifIntercepted() == null)
+ return super.permits();
+
+ int current = permits.get();
+ boolean res = permits.compareAndSet(current, 0);
+ assert res;
+ return current;
+ }
+
+ @Override
+ public void release(int release)
+ {
+ if (ifIntercepted() == null)
+ {
+ super.release();
+ return;
+ }
+
+ int current = permits.get();
+ permits.compareAndSet(current, current + release);
+ int remaining = permits.get();
+ while (!interceptible.isEmpty() && remaining > 0)
+ {
+ SemaphoreSignal signal = interceptible.peek();
+ if (signal.permits >= remaining)
+ interceptible.poll().signal();
+ else if (fair)
+ // Do not break enqueue order if using fair scheduler
+ break;
+ }
+ }
+
+ @Override
+ public boolean tryAcquire(int acquire)
+ {
+ if (ifIntercepted() == null)
+ return super.tryAcquire(acquire);
+
+ int current = permits.get();
+ if (current >= acquire)
+ {
+ return permits.compareAndSet(current, current - acquire);
+ }
+ else
+ {
+ return false;
+ }
+ }
+
+ @Override
+ public boolean tryAcquire(int acquire, long time, TimeUnit unit) throws InterruptedException
+ {
+ if (ifIntercepted() == null)
+ return super.tryAcquire(acquire);
+
+ int current = permits.get();
+ if (current >= acquire)
+ return permits.compareAndSet(current, current - acquire);
+
+ SemaphoreSignal signal = new SemaphoreSignal(acquire);
+ interceptible.add(signal);
+ signal.await(time, unit);
+ return permits.compareAndSet(current, current - acquire);
+ }
+
+ @Override
+ public boolean tryAcquireUntil(int acquire, long nanoTimeDeadline) throws InterruptedException
+ {
+ if (ifIntercepted() == null)
+ return super.tryAcquireUntil(acquire, nanoTimeDeadline);
+
+ int current = permits.get();
+ if (current >= acquire)
+ return permits.compareAndSet(current, current - acquire);
+
+ SemaphoreSignal signal = new SemaphoreSignal(acquire);
+ interceptible.add(signal);
+ signal.awaitUntil(nanoTimeDeadline);
+ return permits.compareAndSet(current, current - acquire);
+ }
+
+ @Override
+ public void acquire(int acquire) throws InterruptedException
+ {
+ if (ifIntercepted() == null)
+ {
+ super.acquire(acquire);
+ return;
+ }
+
+ while (true)
+ {
+ if (tryAcquire(acquire))
+ return;
+
+ SemaphoreSignal signal = new SemaphoreSignal(acquire);
+ interceptible.add(signal);
+ signal.await();
+ }
+ }
+
+ @Override
+ public void acquireThrowUncheckedOnInterrupt(int acquire) throws UncheckedInterruptedException
+ {
+ try
+ {
+ acquire();
Review Comment:
```suggestion
acquire(acquire);
```
--
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.
To unsubscribe, e-mail: pr-unsubscribe@cassandra.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: pr-unsubscribe@cassandra.apache.org
For additional commands, e-mail: pr-help@cassandra.apache.org
Re: [PR] Bring back Journal simulator (w/o Accord at least for now); add semap… [cassandra]
Posted by "ifesdjeen (via GitHub)" <gi...@apache.org>.
ifesdjeen commented on code in PR #3408:
URL: https://github.com/apache/cassandra/pull/3408#discussion_r1669867566
##########
test/simulator/main/org/apache/cassandra/simulator/systems/InterceptorOfGlobalMethods.java:
##########
@@ -383,12 +404,12 @@ public static CountDownLatch newCountDownLatch(int count)
public static Semaphore newSemaphore(int count)
{
- return new Standard(count, false);
+ return methods.newSemaphore(count);
}
public static Semaphore newFairSemaphore(int count)
{
- return new Standard(count, true);
+ return methods.newSemaphore(count);
Review Comment:
Well spotted, thanks!
##########
test/simulator/test/org/apache/cassandra/simulator/test/SimulationTestBase.java:
##########
@@ -229,10 +230,16 @@ public static void simulate(IIsolatedExecutor.SerializableRunnable[] runnables,
InstanceClassLoader classLoader = new InstanceClassLoader(1, 1, AbstractCluster.CURRENT_VERSION.classpath,
Thread.currentThread().getContextClassLoader(),
sharedClassPredicate,
- new InterceptClasses((x) -> () -> 1.0f, (x) -> () -> 1.0f, NemesisFieldSelectors.get(), ClassLoader.getSystemClassLoader(), sharedClassPredicate.negate())::apply);
+ new InterceptClasses((x) -> () -> 1.0f, (x) -> () -> 1.0f,
+ NemesisFieldSelectors.get(),
+ ClassLoader.getSystemClassLoader(),
+ sharedClassPredicate.negate())::apply);
ThreadGroup tg = new ThreadGroup("test");
- InterceptorOfGlobalMethods interceptorOfGlobalMethods = new InterceptingGlobalMethods(NONE, null, failures, random);
+ InterceptedWait.CaptureSites.Capture capture = new InterceptedWait.CaptureSites.Capture(false, false, false);
+ InterceptorOfGlobalMethods interceptorOfGlobalMethods = IsolatedExecutor.transferAdhoc((IIsolatedExecutor.SerializableQuadFunction<InterceptedWait.CaptureSites.Capture, LongConsumer, Consumer<Throwable>, RandomSource, InterceptorOfGlobalMethods>) InterceptingGlobalMethods::new, classLoader)
+ .apply(capture, (ignore) -> {}, failures, random);
Review Comment:
Essentially, without this, we are not properly intercepting some of the things, like a `WaitQueue` and `Semaphore` so they would throw something like below. I do not know how previous test worked without this, but by he time I uncommented it was already throwing.
```
java.lang.NullPointerException: null
at org.apache.cassandra.simulator.systems.InterceptorOfGlobalMethods$Global.ifIntercepted(InterceptorOfGlobalMethods.java:437)
at org.apache.cassandra.simulator.systems.InterceptingWaitQueue.register(InterceptingWaitQueue.java:52)
at org.apache.cassandra.journal.Journal.awaitAvailableSegment(Journal.java:468)
at org.apache.cassandra.journal.Journal.advanceSegment(Journal.java:454)
at org.apache.cassandra.journal.Journal.start(Journal.java:157)
at org.apache.cassandra.simulator.test.AccordJournalSimulationTest.check(AccordJournalSimulationTest.java:100)
at org.apache.cassandra.simulator.test.AccordJournalSimulationTest.lambda$simpleRWTest$81c80a4a$2(AccordJournalSimulationTest.java:95)
at org.apache.cassandra.simulator.systems.InterceptedExecution$InterceptedThreadStart.run(InterceptedExecution.java:216)
at io.netty.util.concurrent.FastThreadLocalRunnable.run(FastThreadLocalRunnable.java:30)
at java.base/java.lang.Thread.run(Thread.java:829)
```
```
java.lang.NullPointerException: null
at org.apache.cassandra.simulator.systems.InterceptorOfGlobalMethods$Global.ifIntercepted(InterceptorOfGlobalMethods.java:437)
at org.apache.cassandra.simulator.systems.InterceptingAwaitable$InterceptingCondition.maybeIntercept(InterceptingAwaitable.java:137)
at org.apache.cassandra.simulator.systems.InterceptingAwaitable.awaitUninterruptibly(InterceptingAwaitable.java:97)
at org.apache.cassandra.simulator.test.TrivialSimulationTest.lambda$semaphoreTest$81c80a4a$1(TrivialSimulationTest.java:119)
at org.apache.cassandra.simulator.systems.InterceptedExecution$InterceptedThreadStart.run(InterceptedExecution.java:216)
```
--
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.
To unsubscribe, e-mail: pr-unsubscribe@cassandra.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: pr-unsubscribe@cassandra.apache.org
For additional commands, e-mail: pr-help@cassandra.apache.org
Re: [PR] Bring back Journal simulator (w/o Accord at least for now); add semap… [cassandra]
Posted by "ifesdjeen (via GitHub)" <gi...@apache.org>.
ifesdjeen commented on code in PR #3408:
URL: https://github.com/apache/cassandra/pull/3408#discussion_r1676812352
##########
test/simulator/test/org/apache/cassandra/simulator/test/TrivialSimulationTest.java:
##########
@@ -85,9 +97,97 @@ public void componentTest()
}
@Test
- public void identityHashMapTest()
+ public void semaphoreTest()
{
- simulate(arr(() -> new IdentityHashMap<>().put(1, 1)),
- () -> {});
+ long seed = System.currentTimeMillis();
+ semaphoreTestInternal(seed);
+ State.record = false;
+ // Verify that subsequent interleavings will be the same
+ semaphoreTestInternal(seed);
+ }
+
+ protected void semaphoreTestInternal(long seed)
+ {
+ simulate(arr(() -> {
+ ExecutorPlus executor = ExecutorFactory.Global.executorFactory().pooled("semaphore-test-", 10);
+ Semaphore semaphore = Semaphore.newSemaphore(5);
+ CountDownLatch latch = CountDownLatch.newCountDownLatch(5);
+
+ for (int i = 0; i < 5; i++)
+ {
+ int thread = i;
+ executor.submit(() -> {
+ for (int j = 0; j < 100; j++)
+ {
+ int permits = semaphore.permits();
+ Assert.assertTrue(permits + " should be non negative", permits >= 0);
+
+ try
+ {
+ semaphore.acquire(1);
+ State.tick(thread, j);
+ semaphore.release(1);
+ }
+ catch (Throwable e)
+ {
+ throw new RuntimeException(e);
+ }
+ }
+ latch.decrement();
+ });
+ }
+
+ latch.awaitUninterruptibly();
+ int permits = semaphore.permits();
+ Assert.assertEquals(5, permits);
+ }),
+ () -> {},
+ seed);
+ }
+
+ @Shared
+ public static class State
+ {
+ static final List<Tick> ticks = new ArrayList<>();
+ static boolean record = true;
+ static int i = 0;
+
+ public static void tick(int thread, int iteration)
Review Comment:
It does not have to be thread safe. It is executed effectively in a single thread; this is also why we have same interleavings no matter how many times you run it.
--
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.
To unsubscribe, e-mail: pr-unsubscribe@cassandra.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: pr-unsubscribe@cassandra.apache.org
For additional commands, e-mail: pr-help@cassandra.apache.org
Re: [PR] Bring back Journal simulator (w/o Accord at least for now); add semap… [cassandra]
Posted by "dcapwell (via GitHub)" <gi...@apache.org>.
dcapwell commented on code in PR #3408:
URL: https://github.com/apache/cassandra/pull/3408#discussion_r1669369136
##########
test/simulator/test/org/apache/cassandra/simulator/test/SimulationTestBase.java:
##########
@@ -229,10 +230,16 @@ public static void simulate(IIsolatedExecutor.SerializableRunnable[] runnables,
InstanceClassLoader classLoader = new InstanceClassLoader(1, 1, AbstractCluster.CURRENT_VERSION.classpath,
Thread.currentThread().getContextClassLoader(),
sharedClassPredicate,
- new InterceptClasses((x) -> () -> 1.0f, (x) -> () -> 1.0f, NemesisFieldSelectors.get(), ClassLoader.getSystemClassLoader(), sharedClassPredicate.negate())::apply);
+ new InterceptClasses((x) -> () -> 1.0f, (x) -> () -> 1.0f,
+ NemesisFieldSelectors.get(),
+ ClassLoader.getSystemClassLoader(),
+ sharedClassPredicate.negate())::apply);
ThreadGroup tg = new ThreadGroup("test");
- InterceptorOfGlobalMethods interceptorOfGlobalMethods = new InterceptingGlobalMethods(NONE, null, failures, random);
+ InterceptedWait.CaptureSites.Capture capture = new InterceptedWait.CaptureSites.Capture(false, false, false);
+ InterceptorOfGlobalMethods interceptorOfGlobalMethods = IsolatedExecutor.transferAdhoc((IIsolatedExecutor.SerializableQuadFunction<InterceptedWait.CaptureSites.Capture, LongConsumer, Consumer<Throwable>, RandomSource, InterceptorOfGlobalMethods>) InterceptingGlobalMethods::new, classLoader)
+ .apply(capture, (ignore) -> {}, failures, random);
Review Comment:
not familiar enough, can you explain this change?
--
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.
To unsubscribe, e-mail: pr-unsubscribe@cassandra.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: pr-unsubscribe@cassandra.apache.org
For additional commands, e-mail: pr-help@cassandra.apache.org
Re: [PR] Bring back Journal simulator (w/o Accord at least for now); add semap… [cassandra]
Posted by "ifesdjeen (via GitHub)" <gi...@apache.org>.
ifesdjeen commented on code in PR #3408:
URL: https://github.com/apache/cassandra/pull/3408#discussion_r1676812761
##########
test/simulator/main/org/apache/cassandra/simulator/systems/InterceptingSemaphore.java:
##########
@@ -0,0 +1,180 @@
+/*
+ * 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.cassandra.simulator.systems;
+
+import java.util.Queue;
+import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import org.apache.cassandra.utils.concurrent.Semaphore;
+import org.apache.cassandra.utils.concurrent.UncheckedInterruptedException;
+
+import static org.apache.cassandra.simulator.systems.InterceptorOfGlobalMethods.Global.ifIntercepted;
+
+public class InterceptingSemaphore extends Semaphore.Standard
+{
+ final Queue<SemaphoreSignal> interceptible = new ConcurrentLinkedQueue<>();
+ final AtomicInteger permits;
+ final boolean fair;
+
+ private static class SemaphoreSignal extends InterceptingAwaitable.InterceptingSignal<Void>
+ {
+ private final int permits;
+
+ private SemaphoreSignal(int permits)
+ {
+ this.permits = permits;
+ }
+ }
+
+ public InterceptingSemaphore(int permits, boolean fair)
+ {
+ super(permits);
+ this.permits = new AtomicInteger(permits);
+ this.fair = fair;
+ }
+
+ @Override
+ public int permits()
+ {
+ if (ifIntercepted() == null)
+ return super.permits();
+
+ return permits.get();
+ }
+
+ @Override
+ public int drain()
+ {
+ if (ifIntercepted() == null)
+ return super.permits();
+
+ int current = permits.get();
+ boolean res = permits.compareAndSet(current, 0);
+ assert res;
+ return current;
+ }
+
+ @Override
+ public void release(int release)
+ {
+ if (ifIntercepted() == null)
+ {
+ super.release();
+ return;
+ }
+
+ int current = permits.get();
+ permits.compareAndSet(current, current + release);
+ int remaining = permits.get();
+ while (!interceptible.isEmpty() && remaining > 0)
+ {
+ SemaphoreSignal signal = interceptible.peek();
+ if (signal.permits >= remaining)
+ interceptible.poll().signal();
+ else if (fair)
+ // Do not break enqueue order if using fair scheduler
+ break;
+ }
+ }
+
+ @Override
+ public boolean tryAcquire(int acquire)
+ {
+ if (ifIntercepted() == null)
+ return super.tryAcquire(acquire);
+
+ int current = permits.get();
+ if (current >= acquire)
+ {
+ return permits.compareAndSet(current, current - acquire);
+ }
+ else
+ {
+ return false;
+ }
+ }
+
+ @Override
+ public boolean tryAcquire(int acquire, long time, TimeUnit unit) throws InterruptedException
+ {
+ if (ifIntercepted() == null)
+ return super.tryAcquire(acquire);
+
+ int current = permits.get();
+ if (current >= acquire)
+ return permits.compareAndSet(current, current - acquire);
+
+ SemaphoreSignal signal = new SemaphoreSignal(acquire);
+ interceptible.add(signal);
+ signal.await(time, unit);
+ return permits.compareAndSet(current, current - acquire);
+ }
+
+ @Override
+ public boolean tryAcquireUntil(int acquire, long nanoTimeDeadline) throws InterruptedException
+ {
+ if (ifIntercepted() == null)
+ return super.tryAcquireUntil(acquire, nanoTimeDeadline);
+
+ int current = permits.get();
+ if (current >= acquire)
+ return permits.compareAndSet(current, current - acquire);
Review Comment:
BTW, loop is not needed. I am adding it only because it might be easier for people to reason about this. We will never have contention there, confirmed by @belliottsmith
--
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.
To unsubscribe, e-mail: pr-unsubscribe@cassandra.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: pr-unsubscribe@cassandra.apache.org
For additional commands, e-mail: pr-help@cassandra.apache.org
Re: [PR] Bring back Journal simulator (w/o Accord at least for now); add semap… [cassandra]
Posted by "ifesdjeen (via GitHub)" <gi...@apache.org>.
ifesdjeen commented on code in PR #3408:
URL: https://github.com/apache/cassandra/pull/3408#discussion_r1676813935
##########
test/simulator/main/org/apache/cassandra/simulator/systems/InterceptingSemaphore.java:
##########
@@ -0,0 +1,187 @@
+/*
+ * 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.cassandra.simulator.systems;
+
+import java.util.Queue;
+import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import org.apache.cassandra.utils.Clock;
+import org.apache.cassandra.utils.concurrent.Semaphore;
+import org.apache.cassandra.utils.concurrent.UncheckedInterruptedException;
+
+import static org.apache.cassandra.simulator.systems.InterceptorOfGlobalMethods.Global.ifIntercepted;
+
+public class InterceptingSemaphore extends Semaphore.Standard
+{
+ final Queue<SemaphoreSignal> interceptible = new ConcurrentLinkedQueue<>();
+ final AtomicInteger permits;
+ final boolean fair;
+
+ private static class SemaphoreSignal extends InterceptingAwaitable.InterceptingSignal<Void>
+ {
+ private final int permits;
+
+ private SemaphoreSignal(int permits)
+ {
+ this.permits = permits;
+ }
+ }
+
+ public InterceptingSemaphore(int permits, boolean fair)
+ {
+ super(permits);
+ this.permits = new AtomicInteger(permits);
+ this.fair = fair;
+ }
+
+ @Override
+ public int permits()
+ {
+ if (ifIntercepted() == null)
+ return super.permits();
+
+ return permits.get();
+ }
+
+ @Override
+ public int drain()
+ {
+ if (ifIntercepted() == null)
+ return super.drain();
+
+ for (int i = 0; i < 10; i++)
+ {
+ int current = permits.get();
+ if (permits.compareAndSet(current, 0))
+ return current;
+ }
+
+ throw new IllegalStateException("Too much contention");
+ }
+
+ @Override
+ public void release(int release)
+ {
+ if (ifIntercepted() == null)
+ {
+ super.release(release);
+ return;
+ }
+
+ int remaining = permits.addAndGet(release);
+ while (!interceptible.isEmpty() && remaining > 0)
+ {
+ SemaphoreSignal signal = interceptible.peek();
+ if (signal.permits >= remaining)
+ interceptible.poll().signal();
+ else if (fair)
+ // Do not break enqueue order if using fair scheduler
+ break;
+ }
+ }
+
+ @Override
+ public boolean tryAcquire(int acquire)
+ {
+ if (ifIntercepted() == null)
+ return super.tryAcquire(acquire);
+
+ for (int i = 0; i < 10; i++)
+ {
+ int current = permits.get();
+ if (current >= acquire)
+ {
+ if (permits.compareAndSet(current, current - acquire))
+ return true;
+ }
+ else
+ {
+ return false;
+ }
+ }
+ throw new IllegalStateException("Too much contention");
+ }
+
+ @Override
+ public boolean tryAcquire(int acquire, long time, TimeUnit unit) throws InterruptedException
+ {
+ if (ifIntercepted() == null)
+ return super.tryAcquire(acquire, time, unit);
+
+ return tryAcquireUntil(acquire, Clock.Global.nanoTime() + unit.toNanos(time));
+ }
+
+ @Override
+ public boolean tryAcquireUntil(int acquire, long deadline) throws InterruptedException
+ {
+ if (ifIntercepted() == null)
+ return super.tryAcquireUntil(acquire, deadline);
+
+ do
+ {
+ int current = permits.get();
+ if (current >= acquire)
+ {
+ if (permits.compareAndSet(current, current - acquire))
+ return true;
+ }
+ SemaphoreSignal signal = new SemaphoreSignal(acquire);
+ interceptible.add(signal);
+ signal.awaitUntil(deadline);
+ }
+ while (Clock.Global.nanoTime() < deadline);
Review Comment:
My assumption was that`Clock.Global.nanoTime()` is intercepted and redirected to simulated time. I will double check if that's the case.
--
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.
To unsubscribe, e-mail: pr-unsubscribe@cassandra.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: pr-unsubscribe@cassandra.apache.org
For additional commands, e-mail: pr-help@cassandra.apache.org
Re: [PR] Bring back Journal simulator (w/o Accord at least for now); add semap… [cassandra]
Posted by "dcapwell (via GitHub)" <gi...@apache.org>.
dcapwell commented on code in PR #3408:
URL: https://github.com/apache/cassandra/pull/3408#discussion_r1674720471
##########
test/simulator/main/org/apache/cassandra/simulator/systems/InterceptingSemaphore.java:
##########
@@ -0,0 +1,187 @@
+/*
+ * 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.cassandra.simulator.systems;
+
+import java.util.Queue;
+import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import org.apache.cassandra.utils.Clock;
+import org.apache.cassandra.utils.concurrent.Semaphore;
+import org.apache.cassandra.utils.concurrent.UncheckedInterruptedException;
+
+import static org.apache.cassandra.simulator.systems.InterceptorOfGlobalMethods.Global.ifIntercepted;
+
+public class InterceptingSemaphore extends Semaphore.Standard
+{
+ final Queue<SemaphoreSignal> interceptible = new ConcurrentLinkedQueue<>();
+ final AtomicInteger permits;
+ final boolean fair;
+
+ private static class SemaphoreSignal extends InterceptingAwaitable.InterceptingSignal<Void>
+ {
+ private final int permits;
+
+ private SemaphoreSignal(int permits)
+ {
+ this.permits = permits;
+ }
+ }
+
+ public InterceptingSemaphore(int permits, boolean fair)
+ {
+ super(permits);
+ this.permits = new AtomicInteger(permits);
+ this.fair = fair;
+ }
+
+ @Override
+ public int permits()
+ {
+ if (ifIntercepted() == null)
+ return super.permits();
+
+ return permits.get();
+ }
+
+ @Override
+ public int drain()
+ {
+ if (ifIntercepted() == null)
+ return super.drain();
+
+ for (int i = 0; i < 10; i++)
+ {
+ int current = permits.get();
+ if (permits.compareAndSet(current, 0))
+ return current;
+ }
+
+ throw new IllegalStateException("Too much contention");
+ }
+
+ @Override
+ public void release(int release)
+ {
+ if (ifIntercepted() == null)
+ {
+ super.release(release);
+ return;
+ }
+
+ int remaining = permits.addAndGet(release);
+ while (!interceptible.isEmpty() && remaining > 0)
+ {
+ SemaphoreSignal signal = interceptible.peek();
+ if (signal.permits >= remaining)
+ interceptible.poll().signal();
+ else if (fair)
+ // Do not break enqueue order if using fair scheduler
+ break;
+ }
+ }
+
+ @Override
+ public boolean tryAcquire(int acquire)
+ {
+ if (ifIntercepted() == null)
+ return super.tryAcquire(acquire);
+
+ for (int i = 0; i < 10; i++)
+ {
+ int current = permits.get();
+ if (current >= acquire)
+ {
+ if (permits.compareAndSet(current, current - acquire))
+ return true;
+ }
+ else
+ {
+ return false;
+ }
+ }
+ throw new IllegalStateException("Too much contention");
+ }
+
+ @Override
+ public boolean tryAcquire(int acquire, long time, TimeUnit unit) throws InterruptedException
+ {
+ if (ifIntercepted() == null)
+ return super.tryAcquire(acquire, time, unit);
+
+ return tryAcquireUntil(acquire, Clock.Global.nanoTime() + unit.toNanos(time));
Review Comment:
`Clock.Global.nanoTime()` is this right in the context of Simulator? This feels wrong to me...
##########
test/simulator/test/org/apache/cassandra/simulator/test/TrivialSimulationTest.java:
##########
@@ -85,9 +97,97 @@ public void componentTest()
}
@Test
- public void identityHashMapTest()
+ public void semaphoreTest()
{
- simulate(arr(() -> new IdentityHashMap<>().put(1, 1)),
- () -> {});
+ long seed = System.currentTimeMillis();
+ semaphoreTestInternal(seed);
+ State.record = false;
+ // Verify that subsequent interleavings will be the same
+ semaphoreTestInternal(seed);
+ }
+
+ protected void semaphoreTestInternal(long seed)
+ {
+ simulate(arr(() -> {
+ ExecutorPlus executor = ExecutorFactory.Global.executorFactory().pooled("semaphore-test-", 10);
+ Semaphore semaphore = Semaphore.newSemaphore(5);
+ CountDownLatch latch = CountDownLatch.newCountDownLatch(5);
+
+ for (int i = 0; i < 5; i++)
+ {
+ int thread = i;
+ executor.submit(() -> {
+ for (int j = 0; j < 100; j++)
+ {
+ int permits = semaphore.permits();
+ Assert.assertTrue(permits + " should be non negative", permits >= 0);
+
+ try
+ {
+ semaphore.acquire(1);
+ State.tick(thread, j);
+ semaphore.release(1);
+ }
+ catch (Throwable e)
+ {
+ throw new RuntimeException(e);
+ }
+ }
+ latch.decrement();
+ });
+ }
+
+ latch.awaitUninterruptibly();
+ int permits = semaphore.permits();
+ Assert.assertEquals(5, permits);
+ }),
+ () -> {},
+ seed);
+ }
+
+ @Shared
+ public static class State
+ {
+ static final List<Tick> ticks = new ArrayList<>();
+ static boolean record = true;
+ static int i = 0;
+
+ public static void tick(int thread, int iteration)
Review Comment:
is this thread safe? I don't think so
##########
test/simulator/main/org/apache/cassandra/simulator/systems/InterceptingSemaphore.java:
##########
@@ -0,0 +1,187 @@
+/*
+ * 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.cassandra.simulator.systems;
+
+import java.util.Queue;
+import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import org.apache.cassandra.utils.Clock;
+import org.apache.cassandra.utils.concurrent.Semaphore;
+import org.apache.cassandra.utils.concurrent.UncheckedInterruptedException;
+
+import static org.apache.cassandra.simulator.systems.InterceptorOfGlobalMethods.Global.ifIntercepted;
+
+public class InterceptingSemaphore extends Semaphore.Standard
+{
+ final Queue<SemaphoreSignal> interceptible = new ConcurrentLinkedQueue<>();
+ final AtomicInteger permits;
+ final boolean fair;
+
+ private static class SemaphoreSignal extends InterceptingAwaitable.InterceptingSignal<Void>
+ {
+ private final int permits;
+
+ private SemaphoreSignal(int permits)
+ {
+ this.permits = permits;
+ }
+ }
+
+ public InterceptingSemaphore(int permits, boolean fair)
+ {
+ super(permits);
+ this.permits = new AtomicInteger(permits);
+ this.fair = fair;
+ }
+
+ @Override
+ public int permits()
+ {
+ if (ifIntercepted() == null)
+ return super.permits();
+
+ return permits.get();
+ }
+
+ @Override
+ public int drain()
+ {
+ if (ifIntercepted() == null)
+ return super.drain();
+
+ for (int i = 0; i < 10; i++)
+ {
+ int current = permits.get();
+ if (permits.compareAndSet(current, 0))
+ return current;
+ }
+
+ throw new IllegalStateException("Too much contention");
+ }
+
+ @Override
+ public void release(int release)
+ {
+ if (ifIntercepted() == null)
+ {
+ super.release(release);
+ return;
+ }
+
+ int remaining = permits.addAndGet(release);
+ while (!interceptible.isEmpty() && remaining > 0)
+ {
+ SemaphoreSignal signal = interceptible.peek();
+ if (signal.permits >= remaining)
+ interceptible.poll().signal();
+ else if (fair)
+ // Do not break enqueue order if using fair scheduler
+ break;
+ }
+ }
+
+ @Override
+ public boolean tryAcquire(int acquire)
+ {
+ if (ifIntercepted() == null)
+ return super.tryAcquire(acquire);
+
+ for (int i = 0; i < 10; i++)
+ {
+ int current = permits.get();
+ if (current >= acquire)
+ {
+ if (permits.compareAndSet(current, current - acquire))
+ return true;
+ }
+ else
+ {
+ return false;
+ }
+ }
+ throw new IllegalStateException("Too much contention");
+ }
+
+ @Override
+ public boolean tryAcquire(int acquire, long time, TimeUnit unit) throws InterruptedException
+ {
+ if (ifIntercepted() == null)
+ return super.tryAcquire(acquire, time, unit);
+
+ return tryAcquireUntil(acquire, Clock.Global.nanoTime() + unit.toNanos(time));
+ }
+
+ @Override
+ public boolean tryAcquireUntil(int acquire, long deadline) throws InterruptedException
+ {
+ if (ifIntercepted() == null)
+ return super.tryAcquireUntil(acquire, deadline);
+
+ do
+ {
+ int current = permits.get();
+ if (current >= acquire)
+ {
+ if (permits.compareAndSet(current, current - acquire))
+ return true;
+ }
+ SemaphoreSignal signal = new SemaphoreSignal(acquire);
+ interceptible.add(signal);
+ signal.awaitUntil(deadline);
+ }
+ while (Clock.Global.nanoTime() < deadline);
Review Comment:
if we waited until the deadline, then check again and not able to get the lock... shouldn't we stop right away? If we loop again are we not doing it wrong?
##########
test/simulator/main/org/apache/cassandra/simulator/systems/InterceptingSemaphore.java:
##########
@@ -0,0 +1,187 @@
+/*
+ * 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.cassandra.simulator.systems;
+
+import java.util.Queue;
+import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import org.apache.cassandra.utils.Clock;
+import org.apache.cassandra.utils.concurrent.Semaphore;
+import org.apache.cassandra.utils.concurrent.UncheckedInterruptedException;
+
+import static org.apache.cassandra.simulator.systems.InterceptorOfGlobalMethods.Global.ifIntercepted;
+
+public class InterceptingSemaphore extends Semaphore.Standard
+{
+ final Queue<SemaphoreSignal> interceptible = new ConcurrentLinkedQueue<>();
+ final AtomicInteger permits;
+ final boolean fair;
+
+ private static class SemaphoreSignal extends InterceptingAwaitable.InterceptingSignal<Void>
+ {
+ private final int permits;
+
+ private SemaphoreSignal(int permits)
+ {
+ this.permits = permits;
+ }
+ }
+
+ public InterceptingSemaphore(int permits, boolean fair)
+ {
+ super(permits);
+ this.permits = new AtomicInteger(permits);
+ this.fair = fair;
+ }
+
+ @Override
+ public int permits()
+ {
+ if (ifIntercepted() == null)
+ return super.permits();
+
+ return permits.get();
+ }
+
+ @Override
+ public int drain()
+ {
+ if (ifIntercepted() == null)
+ return super.drain();
+
+ for (int i = 0; i < 10; i++)
+ {
+ int current = permits.get();
+ if (permits.compareAndSet(current, 0))
+ return current;
+ }
+
+ throw new IllegalStateException("Too much contention");
+ }
+
+ @Override
+ public void release(int release)
+ {
+ if (ifIntercepted() == null)
+ {
+ super.release(release);
+ return;
+ }
+
+ int remaining = permits.addAndGet(release);
+ while (!interceptible.isEmpty() && remaining > 0)
+ {
+ SemaphoreSignal signal = interceptible.peek();
+ if (signal.permits >= remaining)
+ interceptible.poll().signal();
+ else if (fair)
+ // Do not break enqueue order if using fair scheduler
+ break;
+ }
+ }
+
+ @Override
+ public boolean tryAcquire(int acquire)
+ {
+ if (ifIntercepted() == null)
+ return super.tryAcquire(acquire);
+
+ for (int i = 0; i < 10; i++)
+ {
+ int current = permits.get();
+ if (current >= acquire)
+ {
+ if (permits.compareAndSet(current, current - acquire))
+ return true;
+ }
+ else
+ {
+ return false;
+ }
+ }
+ throw new IllegalStateException("Too much contention");
+ }
+
+ @Override
+ public boolean tryAcquire(int acquire, long time, TimeUnit unit) throws InterruptedException
+ {
+ if (ifIntercepted() == null)
+ return super.tryAcquire(acquire, time, unit);
+
+ return tryAcquireUntil(acquire, Clock.Global.nanoTime() + unit.toNanos(time));
+ }
+
+ @Override
+ public boolean tryAcquireUntil(int acquire, long deadline) throws InterruptedException
+ {
+ if (ifIntercepted() == null)
+ return super.tryAcquireUntil(acquire, deadline);
+
+ do
+ {
+ int current = permits.get();
+ if (current >= acquire)
+ {
+ if (permits.compareAndSet(current, current - acquire))
+ return true;
+ }
+ SemaphoreSignal signal = new SemaphoreSignal(acquire);
+ interceptible.add(signal);
+ signal.awaitUntil(deadline);
+ }
+ while (Clock.Global.nanoTime() < deadline);
Review Comment:
`Clock.Global.nanoTime()` feels wrong as time is owned by Simulator, so the logical time could be multiple hours but the physical time is just a few ms, which would lead to this doing the wrong behavior (and being non-deterministic)?
--
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.
To unsubscribe, e-mail: pr-unsubscribe@cassandra.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: pr-unsubscribe@cassandra.apache.org
For additional commands, e-mail: pr-help@cassandra.apache.org
Re: [PR] Bring back Journal simulator (w/o Accord at least for now); add semap… [cassandra]
Posted by "ifesdjeen (via GitHub)" <gi...@apache.org>.
ifesdjeen commented on code in PR #3408:
URL: https://github.com/apache/cassandra/pull/3408#discussion_r1674661593
##########
test/simulator/main/org/apache/cassandra/simulator/systems/InterceptingSemaphore.java:
##########
@@ -0,0 +1,180 @@
+/*
+ * 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.cassandra.simulator.systems;
+
+import java.util.Queue;
+import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import org.apache.cassandra.utils.concurrent.Semaphore;
+import org.apache.cassandra.utils.concurrent.UncheckedInterruptedException;
+
+import static org.apache.cassandra.simulator.systems.InterceptorOfGlobalMethods.Global.ifIntercepted;
+
+public class InterceptingSemaphore extends Semaphore.Standard
+{
+ final Queue<SemaphoreSignal> interceptible = new ConcurrentLinkedQueue<>();
+ final AtomicInteger permits;
+ final boolean fair;
+
+ private static class SemaphoreSignal extends InterceptingAwaitable.InterceptingSignal<Void>
+ {
+ private final int permits;
+
+ private SemaphoreSignal(int permits)
+ {
+ this.permits = permits;
+ }
+ }
+
+ public InterceptingSemaphore(int permits, boolean fair)
+ {
+ super(permits);
+ this.permits = new AtomicInteger(permits);
+ this.fair = fair;
+ }
+
+ @Override
+ public int permits()
+ {
+ if (ifIntercepted() == null)
+ return super.permits();
+
+ return permits.get();
+ }
+
+ @Override
+ public int drain()
+ {
+ if (ifIntercepted() == null)
+ return super.permits();
+
+ int current = permits.get();
+ boolean res = permits.compareAndSet(current, 0);
+ assert res;
+ return current;
+ }
+
+ @Override
+ public void release(int release)
+ {
+ if (ifIntercepted() == null)
+ {
+ super.release();
+ return;
+ }
+
+ int current = permits.get();
+ permits.compareAndSet(current, current + release);
+ int remaining = permits.get();
+ while (!interceptible.isEmpty() && remaining > 0)
+ {
+ SemaphoreSignal signal = interceptible.peek();
+ if (signal.permits >= remaining)
+ interceptible.poll().signal();
+ else if (fair)
+ // Do not break enqueue order if using fair scheduler
+ break;
+ }
+ }
+
+ @Override
+ public boolean tryAcquire(int acquire)
+ {
+ if (ifIntercepted() == null)
+ return super.tryAcquire(acquire);
+
+ int current = permits.get();
+ if (current >= acquire)
+ {
+ return permits.compareAndSet(current, current - acquire);
+ }
+ else
+ {
+ return false;
+ }
+ }
+
+ @Override
+ public boolean tryAcquire(int acquire, long time, TimeUnit unit) throws InterruptedException
+ {
+ if (ifIntercepted() == null)
+ return super.tryAcquire(acquire);
+
+ int current = permits.get();
+ if (current >= acquire)
+ return permits.compareAndSet(current, current - acquire);
+
+ SemaphoreSignal signal = new SemaphoreSignal(acquire);
+ interceptible.add(signal);
+ signal.await(time, unit);
+ return permits.compareAndSet(current, current - acquire);
+ }
+
+ @Override
+ public boolean tryAcquireUntil(int acquire, long nanoTimeDeadline) throws InterruptedException
+ {
+ if (ifIntercepted() == null)
+ return super.tryAcquireUntil(acquire, nanoTimeDeadline);
+
+ int current = permits.get();
+ if (current >= acquire)
+ return permits.compareAndSet(current, current - acquire);
Review Comment:
switched to add a loop
##########
test/simulator/test/org/apache/cassandra/simulator/test/AccordJournalSimulationTest.java:
##########
@@ -18,250 +18,359 @@
package org.apache.cassandra.simulator.test;
import java.io.IOException;
-import java.util.List;
-import java.util.UUID;
-import java.util.concurrent.CopyOnWriteArrayList;
+import java.nio.ByteBuffer;
+import java.util.Collections;
+import java.util.Optional;
+import java.util.Set;
+import java.util.zip.Checksum;
import javax.annotation.Nullable;
import com.google.common.collect.ImmutableMap;
+import com.google.common.jimfs.Jimfs;
-import accord.topology.TopologyUtils;
+import org.apache.cassandra.concurrent.ExecutorFactory;
+import org.apache.cassandra.concurrent.ExecutorPlus;
import org.apache.cassandra.config.AccordSpec;
+import org.apache.cassandra.config.Config;
+import org.apache.cassandra.db.TypeSizes;
+import org.apache.cassandra.distributed.test.log.CMSTestBase;
+import org.apache.cassandra.harry.sut.TokenPlacementModel;
+import org.apache.cassandra.io.filesystem.ListenableFileSystem;
+import org.apache.cassandra.io.util.DataInputPlus;
+import org.apache.cassandra.io.util.DataOutputPlus;
+import org.apache.cassandra.journal.AsyncCallbacks;
+import org.apache.cassandra.journal.Journal;
+import org.apache.cassandra.journal.KeySupport;
+import org.apache.cassandra.journal.ValueSerializer;
import org.apache.cassandra.schema.*;
-import org.junit.Ignore;
+
+import org.junit.Assert;
import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import accord.Utils;
-import accord.api.Data;
-import accord.api.RoutingKey;
-import accord.api.Update;
-import accord.api.Write;
-import accord.local.Node;
-import accord.messages.MessageType;
-import accord.messages.PreAccept;
-import accord.messages.TxnRequest;
-import accord.primitives.FullKeyRoute;
-import accord.primitives.FullRoute;
-import accord.primitives.Keys;
-import accord.primitives.Ranges;
-import accord.primitives.Seekables;
-import accord.primitives.Timestamp;
-import accord.primitives.Txn;
-import accord.primitives.TxnId;
-import accord.topology.Topologies;
-import org.apache.cassandra.concurrent.ExecutorFactory;
-import org.apache.cassandra.concurrent.ExecutorPlus;
+
import org.apache.cassandra.config.DatabaseDescriptor;
import org.apache.cassandra.config.ParameterizedClass;
-import org.apache.cassandra.db.ColumnFamilyStore;
import org.apache.cassandra.db.Keyspace;
-import org.apache.cassandra.db.commitlog.CommitLog;
-import org.apache.cassandra.db.marshal.Int32Type;
import org.apache.cassandra.dht.Murmur3Partitioner;
import org.apache.cassandra.io.util.File;
-import org.apache.cassandra.io.util.Files;
-import org.apache.cassandra.service.accord.AccordJournal;
-import org.apache.cassandra.service.accord.TokenRange;
-import org.apache.cassandra.service.accord.api.AccordRoutingKey;
-import org.apache.cassandra.service.accord.api.PartitionKey;
-import org.apache.cassandra.service.accord.txn.TxnNamedRead;
-import org.apache.cassandra.service.accord.txn.TxnQuery;
-import org.apache.cassandra.service.accord.txn.TxnRead;
-import org.apache.cassandra.utils.ByteBufferUtil;
+import org.apache.cassandra.tcm.AtomicLongBackedProcessor;
+import org.apache.cassandra.tcm.ClusterMetadata;
import org.apache.cassandra.utils.Isolated;
import org.apache.cassandra.utils.concurrent.CountDownLatch;
public class AccordJournalSimulationTest extends SimulationTestBase
{
@Test
- @Ignore // TODO: re-enable
- public void test() throws IOException
+ public void simpleRWTest() throws IOException
{
- simulate(arr(() -> run()),
- () -> check());
+ simulate(arr(() -> {
+ ListenableFileSystem fs = new ListenableFileSystem(Jimfs.newFileSystem());
+ File.unsafeSetFilesystem(fs);
+ DatabaseDescriptor.daemonInitialization();
+ DatabaseDescriptor.setCommitLogCompression(new ParameterizedClass("LZ4Compressor", ImmutableMap.of())); //
+ DatabaseDescriptor.setCommitLogWriteDiskAccessMode(Config.DiskAccessMode.standard);
+ DatabaseDescriptor.initializeCommitLogDiskAccessMode();
+ System.out.println("DatabaseDescriptor.getCommitLogWriteDiskAccessMode() = " + DatabaseDescriptor.getCommitLogWriteDiskAccessMode());
+
+ DatabaseDescriptor.setPartitionerUnsafe(Murmur3Partitioner.instance);
+ long seed = 1L;
+ DatabaseDescriptor.setAccordJournalDirectory("/journal");
+ new File("/journal").createDirectoriesIfNotExists();
+
+ DatabaseDescriptor.setDumpHeapOnUncaughtException(false);
+
+ Keyspace.setInitialized();
+
+ CMSTestBase.CMSSut sut = new CMSTestBase.CMSSut(AtomicLongBackedProcessor::new,
+ false,
+ new FakeSchema(),
+ new TokenPlacementModel.SimpleReplicationFactor(1));
+
+ State.journal = new Journal<>("AccordJournal",
+ new File("/journal"),
+ new AccordSpec.JournalSpec(),
+ new TestCallbacks(),
+ new IdentityKeySerializer(),
+ new IdentityValueSerializer());
+ }),
+ () -> check());
}
- private static void run()
+ public static void check()
{
- for (int i = 0; i < State.events; i++)
+ State.journal.start();
+ try
+ {
+ for (int i = 0; i < 100; i++)
+ {
+ int finalI = i;
+ State.executor.submit(() -> State.journal.asyncWrite("test" + finalI, "test" + finalI, Collections.singleton(1), null));
+ }
+
+ State.latch.await();
+
+ for (int i = 0; i < 100; i++)
+ {
+ System.out.println("Reading " + State.journal.readFirst("test" + i));
Review Comment:
removed; probably cleaner this way
##########
test/simulator/test/org/apache/cassandra/simulator/test/AccordJournalSimulationTest.java:
##########
@@ -18,250 +18,359 @@
package org.apache.cassandra.simulator.test;
import java.io.IOException;
-import java.util.List;
-import java.util.UUID;
-import java.util.concurrent.CopyOnWriteArrayList;
+import java.nio.ByteBuffer;
+import java.util.Collections;
+import java.util.Optional;
+import java.util.Set;
+import java.util.zip.Checksum;
import javax.annotation.Nullable;
import com.google.common.collect.ImmutableMap;
+import com.google.common.jimfs.Jimfs;
-import accord.topology.TopologyUtils;
+import org.apache.cassandra.concurrent.ExecutorFactory;
+import org.apache.cassandra.concurrent.ExecutorPlus;
import org.apache.cassandra.config.AccordSpec;
+import org.apache.cassandra.config.Config;
+import org.apache.cassandra.db.TypeSizes;
+import org.apache.cassandra.distributed.test.log.CMSTestBase;
+import org.apache.cassandra.harry.sut.TokenPlacementModel;
+import org.apache.cassandra.io.filesystem.ListenableFileSystem;
+import org.apache.cassandra.io.util.DataInputPlus;
+import org.apache.cassandra.io.util.DataOutputPlus;
+import org.apache.cassandra.journal.AsyncCallbacks;
+import org.apache.cassandra.journal.Journal;
+import org.apache.cassandra.journal.KeySupport;
+import org.apache.cassandra.journal.ValueSerializer;
import org.apache.cassandra.schema.*;
-import org.junit.Ignore;
+
+import org.junit.Assert;
import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import accord.Utils;
-import accord.api.Data;
-import accord.api.RoutingKey;
-import accord.api.Update;
-import accord.api.Write;
-import accord.local.Node;
-import accord.messages.MessageType;
-import accord.messages.PreAccept;
-import accord.messages.TxnRequest;
-import accord.primitives.FullKeyRoute;
-import accord.primitives.FullRoute;
-import accord.primitives.Keys;
-import accord.primitives.Ranges;
-import accord.primitives.Seekables;
-import accord.primitives.Timestamp;
-import accord.primitives.Txn;
-import accord.primitives.TxnId;
-import accord.topology.Topologies;
-import org.apache.cassandra.concurrent.ExecutorFactory;
-import org.apache.cassandra.concurrent.ExecutorPlus;
+
import org.apache.cassandra.config.DatabaseDescriptor;
import org.apache.cassandra.config.ParameterizedClass;
-import org.apache.cassandra.db.ColumnFamilyStore;
import org.apache.cassandra.db.Keyspace;
-import org.apache.cassandra.db.commitlog.CommitLog;
-import org.apache.cassandra.db.marshal.Int32Type;
import org.apache.cassandra.dht.Murmur3Partitioner;
import org.apache.cassandra.io.util.File;
-import org.apache.cassandra.io.util.Files;
-import org.apache.cassandra.service.accord.AccordJournal;
-import org.apache.cassandra.service.accord.TokenRange;
-import org.apache.cassandra.service.accord.api.AccordRoutingKey;
-import org.apache.cassandra.service.accord.api.PartitionKey;
-import org.apache.cassandra.service.accord.txn.TxnNamedRead;
-import org.apache.cassandra.service.accord.txn.TxnQuery;
-import org.apache.cassandra.service.accord.txn.TxnRead;
-import org.apache.cassandra.utils.ByteBufferUtil;
+import org.apache.cassandra.tcm.AtomicLongBackedProcessor;
+import org.apache.cassandra.tcm.ClusterMetadata;
import org.apache.cassandra.utils.Isolated;
import org.apache.cassandra.utils.concurrent.CountDownLatch;
public class AccordJournalSimulationTest extends SimulationTestBase
{
@Test
- @Ignore // TODO: re-enable
- public void test() throws IOException
+ public void simpleRWTest() throws IOException
{
- simulate(arr(() -> run()),
- () -> check());
+ simulate(arr(() -> {
+ ListenableFileSystem fs = new ListenableFileSystem(Jimfs.newFileSystem());
+ File.unsafeSetFilesystem(fs);
+ DatabaseDescriptor.daemonInitialization();
+ DatabaseDescriptor.setCommitLogCompression(new ParameterizedClass("LZ4Compressor", ImmutableMap.of())); //
+ DatabaseDescriptor.setCommitLogWriteDiskAccessMode(Config.DiskAccessMode.standard);
+ DatabaseDescriptor.initializeCommitLogDiskAccessMode();
+ System.out.println("DatabaseDescriptor.getCommitLogWriteDiskAccessMode() = " + DatabaseDescriptor.getCommitLogWriteDiskAccessMode());
+
+ DatabaseDescriptor.setPartitionerUnsafe(Murmur3Partitioner.instance);
+ long seed = 1L;
+ DatabaseDescriptor.setAccordJournalDirectory("/journal");
+ new File("/journal").createDirectoriesIfNotExists();
+
+ DatabaseDescriptor.setDumpHeapOnUncaughtException(false);
+
+ Keyspace.setInitialized();
+
+ CMSTestBase.CMSSut sut = new CMSTestBase.CMSSut(AtomicLongBackedProcessor::new,
+ false,
+ new FakeSchema(),
+ new TokenPlacementModel.SimpleReplicationFactor(1));
+
+ State.journal = new Journal<>("AccordJournal",
+ new File("/journal"),
+ new AccordSpec.JournalSpec(),
+ new TestCallbacks(),
+ new IdentityKeySerializer(),
+ new IdentityValueSerializer());
+ }),
+ () -> check());
}
- private static void run()
+ public static void check()
{
- for (int i = 0; i < State.events; i++)
+ State.journal.start();
+ try
+ {
+ for (int i = 0; i < 100; i++)
+ {
+ int finalI = i;
+ State.executor.submit(() -> State.journal.asyncWrite("test" + finalI, "test" + finalI, Collections.singleton(1), null));
+ }
+
+ State.latch.await();
+
+ for (int i = 0; i < 100; i++)
+ {
+ System.out.println("Reading " + State.journal.readFirst("test" + i));
+ Assert.assertEquals(State.journal.readFirst("test" + i), "test" + i);
+ }
+ }
+ catch (Throwable e)
{
- int finalI = i;
- State.executor.execute(() -> State.append(finalI));
+ e.printStackTrace();
Review Comment:
switched to just collect and throw
##########
test/simulator/test/org/apache/cassandra/simulator/test/AccordJournalSimulationTest.java:
##########
@@ -18,250 +18,359 @@
package org.apache.cassandra.simulator.test;
import java.io.IOException;
-import java.util.List;
-import java.util.UUID;
-import java.util.concurrent.CopyOnWriteArrayList;
+import java.nio.ByteBuffer;
+import java.util.Collections;
+import java.util.Optional;
+import java.util.Set;
+import java.util.zip.Checksum;
import javax.annotation.Nullable;
import com.google.common.collect.ImmutableMap;
+import com.google.common.jimfs.Jimfs;
-import accord.topology.TopologyUtils;
+import org.apache.cassandra.concurrent.ExecutorFactory;
+import org.apache.cassandra.concurrent.ExecutorPlus;
import org.apache.cassandra.config.AccordSpec;
+import org.apache.cassandra.config.Config;
+import org.apache.cassandra.db.TypeSizes;
+import org.apache.cassandra.distributed.test.log.CMSTestBase;
+import org.apache.cassandra.harry.sut.TokenPlacementModel;
+import org.apache.cassandra.io.filesystem.ListenableFileSystem;
+import org.apache.cassandra.io.util.DataInputPlus;
+import org.apache.cassandra.io.util.DataOutputPlus;
+import org.apache.cassandra.journal.AsyncCallbacks;
+import org.apache.cassandra.journal.Journal;
+import org.apache.cassandra.journal.KeySupport;
+import org.apache.cassandra.journal.ValueSerializer;
import org.apache.cassandra.schema.*;
-import org.junit.Ignore;
+
+import org.junit.Assert;
import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import accord.Utils;
-import accord.api.Data;
-import accord.api.RoutingKey;
-import accord.api.Update;
-import accord.api.Write;
-import accord.local.Node;
-import accord.messages.MessageType;
-import accord.messages.PreAccept;
-import accord.messages.TxnRequest;
-import accord.primitives.FullKeyRoute;
-import accord.primitives.FullRoute;
-import accord.primitives.Keys;
-import accord.primitives.Ranges;
-import accord.primitives.Seekables;
-import accord.primitives.Timestamp;
-import accord.primitives.Txn;
-import accord.primitives.TxnId;
-import accord.topology.Topologies;
-import org.apache.cassandra.concurrent.ExecutorFactory;
-import org.apache.cassandra.concurrent.ExecutorPlus;
+
import org.apache.cassandra.config.DatabaseDescriptor;
import org.apache.cassandra.config.ParameterizedClass;
-import org.apache.cassandra.db.ColumnFamilyStore;
import org.apache.cassandra.db.Keyspace;
-import org.apache.cassandra.db.commitlog.CommitLog;
-import org.apache.cassandra.db.marshal.Int32Type;
import org.apache.cassandra.dht.Murmur3Partitioner;
import org.apache.cassandra.io.util.File;
-import org.apache.cassandra.io.util.Files;
-import org.apache.cassandra.service.accord.AccordJournal;
-import org.apache.cassandra.service.accord.TokenRange;
-import org.apache.cassandra.service.accord.api.AccordRoutingKey;
-import org.apache.cassandra.service.accord.api.PartitionKey;
-import org.apache.cassandra.service.accord.txn.TxnNamedRead;
-import org.apache.cassandra.service.accord.txn.TxnQuery;
-import org.apache.cassandra.service.accord.txn.TxnRead;
-import org.apache.cassandra.utils.ByteBufferUtil;
+import org.apache.cassandra.tcm.AtomicLongBackedProcessor;
+import org.apache.cassandra.tcm.ClusterMetadata;
import org.apache.cassandra.utils.Isolated;
import org.apache.cassandra.utils.concurrent.CountDownLatch;
public class AccordJournalSimulationTest extends SimulationTestBase
{
@Test
- @Ignore // TODO: re-enable
- public void test() throws IOException
+ public void simpleRWTest() throws IOException
{
- simulate(arr(() -> run()),
- () -> check());
+ simulate(arr(() -> {
+ ListenableFileSystem fs = new ListenableFileSystem(Jimfs.newFileSystem());
+ File.unsafeSetFilesystem(fs);
+ DatabaseDescriptor.daemonInitialization();
+ DatabaseDescriptor.setCommitLogCompression(new ParameterizedClass("LZ4Compressor", ImmutableMap.of())); //
+ DatabaseDescriptor.setCommitLogWriteDiskAccessMode(Config.DiskAccessMode.standard);
+ DatabaseDescriptor.initializeCommitLogDiskAccessMode();
+ System.out.println("DatabaseDescriptor.getCommitLogWriteDiskAccessMode() = " + DatabaseDescriptor.getCommitLogWriteDiskAccessMode());
Review Comment:
Good point; removed.
##########
test/simulator/test/org/apache/cassandra/simulator/test/AccordJournalSimulationTest.java:
##########
@@ -18,250 +18,359 @@
package org.apache.cassandra.simulator.test;
import java.io.IOException;
-import java.util.List;
-import java.util.UUID;
-import java.util.concurrent.CopyOnWriteArrayList;
+import java.nio.ByteBuffer;
+import java.util.Collections;
+import java.util.Optional;
+import java.util.Set;
+import java.util.zip.Checksum;
import javax.annotation.Nullable;
import com.google.common.collect.ImmutableMap;
+import com.google.common.jimfs.Jimfs;
-import accord.topology.TopologyUtils;
+import org.apache.cassandra.concurrent.ExecutorFactory;
+import org.apache.cassandra.concurrent.ExecutorPlus;
import org.apache.cassandra.config.AccordSpec;
+import org.apache.cassandra.config.Config;
+import org.apache.cassandra.db.TypeSizes;
+import org.apache.cassandra.distributed.test.log.CMSTestBase;
+import org.apache.cassandra.harry.sut.TokenPlacementModel;
+import org.apache.cassandra.io.filesystem.ListenableFileSystem;
+import org.apache.cassandra.io.util.DataInputPlus;
+import org.apache.cassandra.io.util.DataOutputPlus;
+import org.apache.cassandra.journal.AsyncCallbacks;
+import org.apache.cassandra.journal.Journal;
+import org.apache.cassandra.journal.KeySupport;
+import org.apache.cassandra.journal.ValueSerializer;
import org.apache.cassandra.schema.*;
-import org.junit.Ignore;
+
+import org.junit.Assert;
import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import accord.Utils;
-import accord.api.Data;
-import accord.api.RoutingKey;
-import accord.api.Update;
-import accord.api.Write;
-import accord.local.Node;
-import accord.messages.MessageType;
-import accord.messages.PreAccept;
-import accord.messages.TxnRequest;
-import accord.primitives.FullKeyRoute;
-import accord.primitives.FullRoute;
-import accord.primitives.Keys;
-import accord.primitives.Ranges;
-import accord.primitives.Seekables;
-import accord.primitives.Timestamp;
-import accord.primitives.Txn;
-import accord.primitives.TxnId;
-import accord.topology.Topologies;
-import org.apache.cassandra.concurrent.ExecutorFactory;
-import org.apache.cassandra.concurrent.ExecutorPlus;
+
import org.apache.cassandra.config.DatabaseDescriptor;
import org.apache.cassandra.config.ParameterizedClass;
-import org.apache.cassandra.db.ColumnFamilyStore;
import org.apache.cassandra.db.Keyspace;
-import org.apache.cassandra.db.commitlog.CommitLog;
-import org.apache.cassandra.db.marshal.Int32Type;
import org.apache.cassandra.dht.Murmur3Partitioner;
import org.apache.cassandra.io.util.File;
-import org.apache.cassandra.io.util.Files;
-import org.apache.cassandra.service.accord.AccordJournal;
-import org.apache.cassandra.service.accord.TokenRange;
-import org.apache.cassandra.service.accord.api.AccordRoutingKey;
-import org.apache.cassandra.service.accord.api.PartitionKey;
-import org.apache.cassandra.service.accord.txn.TxnNamedRead;
-import org.apache.cassandra.service.accord.txn.TxnQuery;
-import org.apache.cassandra.service.accord.txn.TxnRead;
-import org.apache.cassandra.utils.ByteBufferUtil;
+import org.apache.cassandra.tcm.AtomicLongBackedProcessor;
+import org.apache.cassandra.tcm.ClusterMetadata;
import org.apache.cassandra.utils.Isolated;
import org.apache.cassandra.utils.concurrent.CountDownLatch;
public class AccordJournalSimulationTest extends SimulationTestBase
{
@Test
- @Ignore // TODO: re-enable
- public void test() throws IOException
+ public void simpleRWTest() throws IOException
{
- simulate(arr(() -> run()),
- () -> check());
+ simulate(arr(() -> {
+ ListenableFileSystem fs = new ListenableFileSystem(Jimfs.newFileSystem());
+ File.unsafeSetFilesystem(fs);
+ DatabaseDescriptor.daemonInitialization();
+ DatabaseDescriptor.setCommitLogCompression(new ParameterizedClass("LZ4Compressor", ImmutableMap.of())); //
+ DatabaseDescriptor.setCommitLogWriteDiskAccessMode(Config.DiskAccessMode.standard);
+ DatabaseDescriptor.initializeCommitLogDiskAccessMode();
+ System.out.println("DatabaseDescriptor.getCommitLogWriteDiskAccessMode() = " + DatabaseDescriptor.getCommitLogWriteDiskAccessMode());
+
+ DatabaseDescriptor.setPartitionerUnsafe(Murmur3Partitioner.instance);
+ long seed = 1L;
+ DatabaseDescriptor.setAccordJournalDirectory("/journal");
+ new File("/journal").createDirectoriesIfNotExists();
+
+ DatabaseDescriptor.setDumpHeapOnUncaughtException(false);
+
+ Keyspace.setInitialized();
+
+ CMSTestBase.CMSSut sut = new CMSTestBase.CMSSut(AtomicLongBackedProcessor::new,
+ false,
+ new FakeSchema(),
+ new TokenPlacementModel.SimpleReplicationFactor(1));
Review Comment:
On closer inspection, you are right, since this is not `AccordJournal` we do not need to set up schema here!
##########
test/simulator/main/org/apache/cassandra/simulator/systems/InterceptingSemaphore.java:
##########
@@ -0,0 +1,180 @@
+/*
+ * 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.cassandra.simulator.systems;
+
+import java.util.Queue;
+import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import org.apache.cassandra.utils.concurrent.Semaphore;
+import org.apache.cassandra.utils.concurrent.UncheckedInterruptedException;
+
+import static org.apache.cassandra.simulator.systems.InterceptorOfGlobalMethods.Global.ifIntercepted;
+
+public class InterceptingSemaphore extends Semaphore.Standard
+{
+ final Queue<SemaphoreSignal> interceptible = new ConcurrentLinkedQueue<>();
+ final AtomicInteger permits;
+ final boolean fair;
+
+ private static class SemaphoreSignal extends InterceptingAwaitable.InterceptingSignal<Void>
+ {
+ private final int permits;
+
+ private SemaphoreSignal(int permits)
+ {
+ this.permits = permits;
+ }
+ }
+
+ public InterceptingSemaphore(int permits, boolean fair)
+ {
+ super(permits);
+ this.permits = new AtomicInteger(permits);
+ this.fair = fair;
+ }
+
+ @Override
+ public int permits()
+ {
+ if (ifIntercepted() == null)
+ return super.permits();
+
+ return permits.get();
+ }
+
+ @Override
+ public int drain()
+ {
+ if (ifIntercepted() == null)
+ return super.permits();
+
+ int current = permits.get();
+ boolean res = permits.compareAndSet(current, 0);
+ assert res;
+ return current;
+ }
+
+ @Override
+ public void release(int release)
+ {
+ if (ifIntercepted() == null)
+ {
+ super.release();
+ return;
+ }
+
+ int current = permits.get();
+ permits.compareAndSet(current, current + release);
+ int remaining = permits.get();
+ while (!interceptible.isEmpty() && remaining > 0)
+ {
+ SemaphoreSignal signal = interceptible.peek();
+ if (signal.permits >= remaining)
+ interceptible.poll().signal();
+ else if (fair)
+ // Do not break enqueue order if using fair scheduler
+ break;
+ }
+ }
+
+ @Override
+ public boolean tryAcquire(int acquire)
+ {
+ if (ifIntercepted() == null)
+ return super.tryAcquire(acquire);
+
+ int current = permits.get();
+ if (current >= acquire)
+ {
+ return permits.compareAndSet(current, current - acquire);
Review Comment:
switched to add loop here
##########
test/simulator/test/org/apache/cassandra/simulator/test/AccordJournalSimulationTest.java:
##########
@@ -18,250 +18,359 @@
package org.apache.cassandra.simulator.test;
import java.io.IOException;
-import java.util.List;
-import java.util.UUID;
-import java.util.concurrent.CopyOnWriteArrayList;
+import java.nio.ByteBuffer;
+import java.util.Collections;
+import java.util.Optional;
+import java.util.Set;
+import java.util.zip.Checksum;
import javax.annotation.Nullable;
import com.google.common.collect.ImmutableMap;
+import com.google.common.jimfs.Jimfs;
-import accord.topology.TopologyUtils;
+import org.apache.cassandra.concurrent.ExecutorFactory;
+import org.apache.cassandra.concurrent.ExecutorPlus;
import org.apache.cassandra.config.AccordSpec;
+import org.apache.cassandra.config.Config;
+import org.apache.cassandra.db.TypeSizes;
+import org.apache.cassandra.distributed.test.log.CMSTestBase;
+import org.apache.cassandra.harry.sut.TokenPlacementModel;
+import org.apache.cassandra.io.filesystem.ListenableFileSystem;
+import org.apache.cassandra.io.util.DataInputPlus;
+import org.apache.cassandra.io.util.DataOutputPlus;
+import org.apache.cassandra.journal.AsyncCallbacks;
+import org.apache.cassandra.journal.Journal;
+import org.apache.cassandra.journal.KeySupport;
+import org.apache.cassandra.journal.ValueSerializer;
import org.apache.cassandra.schema.*;
-import org.junit.Ignore;
+
+import org.junit.Assert;
import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import accord.Utils;
-import accord.api.Data;
-import accord.api.RoutingKey;
-import accord.api.Update;
-import accord.api.Write;
-import accord.local.Node;
-import accord.messages.MessageType;
-import accord.messages.PreAccept;
-import accord.messages.TxnRequest;
-import accord.primitives.FullKeyRoute;
-import accord.primitives.FullRoute;
-import accord.primitives.Keys;
-import accord.primitives.Ranges;
-import accord.primitives.Seekables;
-import accord.primitives.Timestamp;
-import accord.primitives.Txn;
-import accord.primitives.TxnId;
-import accord.topology.Topologies;
-import org.apache.cassandra.concurrent.ExecutorFactory;
-import org.apache.cassandra.concurrent.ExecutorPlus;
+
import org.apache.cassandra.config.DatabaseDescriptor;
import org.apache.cassandra.config.ParameterizedClass;
-import org.apache.cassandra.db.ColumnFamilyStore;
import org.apache.cassandra.db.Keyspace;
-import org.apache.cassandra.db.commitlog.CommitLog;
-import org.apache.cassandra.db.marshal.Int32Type;
import org.apache.cassandra.dht.Murmur3Partitioner;
import org.apache.cassandra.io.util.File;
-import org.apache.cassandra.io.util.Files;
-import org.apache.cassandra.service.accord.AccordJournal;
-import org.apache.cassandra.service.accord.TokenRange;
-import org.apache.cassandra.service.accord.api.AccordRoutingKey;
-import org.apache.cassandra.service.accord.api.PartitionKey;
-import org.apache.cassandra.service.accord.txn.TxnNamedRead;
-import org.apache.cassandra.service.accord.txn.TxnQuery;
-import org.apache.cassandra.service.accord.txn.TxnRead;
-import org.apache.cassandra.utils.ByteBufferUtil;
+import org.apache.cassandra.tcm.AtomicLongBackedProcessor;
+import org.apache.cassandra.tcm.ClusterMetadata;
import org.apache.cassandra.utils.Isolated;
import org.apache.cassandra.utils.concurrent.CountDownLatch;
public class AccordJournalSimulationTest extends SimulationTestBase
{
@Test
- @Ignore // TODO: re-enable
- public void test() throws IOException
+ public void simpleRWTest() throws IOException
{
- simulate(arr(() -> run()),
- () -> check());
+ simulate(arr(() -> {
+ ListenableFileSystem fs = new ListenableFileSystem(Jimfs.newFileSystem());
+ File.unsafeSetFilesystem(fs);
+ DatabaseDescriptor.daemonInitialization();
+ DatabaseDescriptor.setCommitLogCompression(new ParameterizedClass("LZ4Compressor", ImmutableMap.of())); //
+ DatabaseDescriptor.setCommitLogWriteDiskAccessMode(Config.DiskAccessMode.standard);
+ DatabaseDescriptor.initializeCommitLogDiskAccessMode();
+ System.out.println("DatabaseDescriptor.getCommitLogWriteDiskAccessMode() = " + DatabaseDescriptor.getCommitLogWriteDiskAccessMode());
+
+ DatabaseDescriptor.setPartitionerUnsafe(Murmur3Partitioner.instance);
+ long seed = 1L;
+ DatabaseDescriptor.setAccordJournalDirectory("/journal");
+ new File("/journal").createDirectoriesIfNotExists();
+
+ DatabaseDescriptor.setDumpHeapOnUncaughtException(false);
+
+ Keyspace.setInitialized();
+
+ CMSTestBase.CMSSut sut = new CMSTestBase.CMSSut(AtomicLongBackedProcessor::new,
+ false,
+ new FakeSchema(),
+ new TokenPlacementModel.SimpleReplicationFactor(1));
+
+ State.journal = new Journal<>("AccordJournal",
+ new File("/journal"),
+ new AccordSpec.JournalSpec(),
+ new TestCallbacks(),
+ new IdentityKeySerializer(),
+ new IdentityValueSerializer());
+ }),
+ () -> check());
}
- private static void run()
+ public static void check()
{
- for (int i = 0; i < State.events; i++)
+ State.journal.start();
+ try
+ {
+ for (int i = 0; i < 100; i++)
+ {
+ int finalI = i;
+ State.executor.submit(() -> State.journal.asyncWrite("test" + finalI, "test" + finalI, Collections.singleton(1), null));
+ }
+
+ State.latch.await();
+
+ for (int i = 0; i < 100; i++)
+ {
+ System.out.println("Reading " + State.journal.readFirst("test" + i));
+ Assert.assertEquals(State.journal.readFirst("test" + i), "test" + i);
+ }
+ }
+ catch (Throwable e)
{
- int finalI = i;
- State.executor.execute(() -> State.append(finalI));
+ e.printStackTrace();
}
+ finally
+ {
+ State.journal.shutdown();
+ }
+ }
- try
+ public static class TestCallbacks implements AsyncCallbacks<String, String>
+ {
+
+ @Override
+ public void onWrite(long segment, int position, int size, String key, String value, Object writeContext)
{
- State.eventsDurable.await();
- State.logger.info("All events are durable done!");
+ State.latch.decrement();
}
- catch (InterruptedException e)
+
+ @Override
+ public void onWriteFailed(String key, String value, Object writeContext, Throwable cause)
{
- throw new AssertionError(e);
+ State.latch.decrement();
Review Comment:
good point!
--
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.
To unsubscribe, e-mail: pr-unsubscribe@cassandra.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: pr-unsubscribe@cassandra.apache.org
For additional commands, e-mail: pr-help@cassandra.apache.org
Re: [PR] Bring back Journal simulator (w/o Accord at least for now); add semap… [cassandra]
Posted by "dcapwell (via GitHub)" <gi...@apache.org>.
dcapwell commented on code in PR #3408:
URL: https://github.com/apache/cassandra/pull/3408#discussion_r1674716364
##########
test/simulator/test/org/apache/cassandra/simulator/test/AccordJournalSimulationTest.java:
##########
@@ -18,250 +18,359 @@
package org.apache.cassandra.simulator.test;
import java.io.IOException;
-import java.util.List;
-import java.util.UUID;
-import java.util.concurrent.CopyOnWriteArrayList;
+import java.nio.ByteBuffer;
+import java.util.Collections;
+import java.util.Optional;
+import java.util.Set;
+import java.util.zip.Checksum;
import javax.annotation.Nullable;
import com.google.common.collect.ImmutableMap;
+import com.google.common.jimfs.Jimfs;
-import accord.topology.TopologyUtils;
+import org.apache.cassandra.concurrent.ExecutorFactory;
+import org.apache.cassandra.concurrent.ExecutorPlus;
import org.apache.cassandra.config.AccordSpec;
+import org.apache.cassandra.config.Config;
+import org.apache.cassandra.db.TypeSizes;
+import org.apache.cassandra.distributed.test.log.CMSTestBase;
+import org.apache.cassandra.harry.sut.TokenPlacementModel;
+import org.apache.cassandra.io.filesystem.ListenableFileSystem;
+import org.apache.cassandra.io.util.DataInputPlus;
+import org.apache.cassandra.io.util.DataOutputPlus;
+import org.apache.cassandra.journal.AsyncCallbacks;
+import org.apache.cassandra.journal.Journal;
+import org.apache.cassandra.journal.KeySupport;
+import org.apache.cassandra.journal.ValueSerializer;
import org.apache.cassandra.schema.*;
-import org.junit.Ignore;
+
+import org.junit.Assert;
import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import accord.Utils;
-import accord.api.Data;
-import accord.api.RoutingKey;
-import accord.api.Update;
-import accord.api.Write;
-import accord.local.Node;
-import accord.messages.MessageType;
-import accord.messages.PreAccept;
-import accord.messages.TxnRequest;
-import accord.primitives.FullKeyRoute;
-import accord.primitives.FullRoute;
-import accord.primitives.Keys;
-import accord.primitives.Ranges;
-import accord.primitives.Seekables;
-import accord.primitives.Timestamp;
-import accord.primitives.Txn;
-import accord.primitives.TxnId;
-import accord.topology.Topologies;
-import org.apache.cassandra.concurrent.ExecutorFactory;
-import org.apache.cassandra.concurrent.ExecutorPlus;
+
import org.apache.cassandra.config.DatabaseDescriptor;
import org.apache.cassandra.config.ParameterizedClass;
-import org.apache.cassandra.db.ColumnFamilyStore;
import org.apache.cassandra.db.Keyspace;
-import org.apache.cassandra.db.commitlog.CommitLog;
-import org.apache.cassandra.db.marshal.Int32Type;
import org.apache.cassandra.dht.Murmur3Partitioner;
import org.apache.cassandra.io.util.File;
-import org.apache.cassandra.io.util.Files;
-import org.apache.cassandra.service.accord.AccordJournal;
-import org.apache.cassandra.service.accord.TokenRange;
-import org.apache.cassandra.service.accord.api.AccordRoutingKey;
-import org.apache.cassandra.service.accord.api.PartitionKey;
-import org.apache.cassandra.service.accord.txn.TxnNamedRead;
-import org.apache.cassandra.service.accord.txn.TxnQuery;
-import org.apache.cassandra.service.accord.txn.TxnRead;
-import org.apache.cassandra.utils.ByteBufferUtil;
+import org.apache.cassandra.tcm.AtomicLongBackedProcessor;
+import org.apache.cassandra.tcm.ClusterMetadata;
import org.apache.cassandra.utils.Isolated;
import org.apache.cassandra.utils.concurrent.CountDownLatch;
public class AccordJournalSimulationTest extends SimulationTestBase
{
@Test
- @Ignore // TODO: re-enable
- public void test() throws IOException
+ public void simpleRWTest() throws IOException
{
- simulate(arr(() -> run()),
- () -> check());
+ simulate(arr(() -> {
+ ListenableFileSystem fs = new ListenableFileSystem(Jimfs.newFileSystem());
+ File.unsafeSetFilesystem(fs);
+ DatabaseDescriptor.daemonInitialization();
+ DatabaseDescriptor.setCommitLogCompression(new ParameterizedClass("LZ4Compressor", ImmutableMap.of())); //
+ DatabaseDescriptor.setCommitLogWriteDiskAccessMode(Config.DiskAccessMode.standard);
+ DatabaseDescriptor.initializeCommitLogDiskAccessMode();
+ System.out.println("DatabaseDescriptor.getCommitLogWriteDiskAccessMode() = " + DatabaseDescriptor.getCommitLogWriteDiskAccessMode());
+
+ DatabaseDescriptor.setPartitionerUnsafe(Murmur3Partitioner.instance);
+ long seed = 1L;
+ DatabaseDescriptor.setAccordJournalDirectory("/journal");
+ new File("/journal").createDirectoriesIfNotExists();
+
+ DatabaseDescriptor.setDumpHeapOnUncaughtException(false);
+
+ Keyspace.setInitialized();
+
+ CMSTestBase.CMSSut sut = new CMSTestBase.CMSSut(AtomicLongBackedProcessor::new,
+ false,
+ new FakeSchema(),
+ new TokenPlacementModel.SimpleReplicationFactor(1));
+
+ State.journal = new Journal<>("AccordJournal",
+ new File("/journal"),
+ new AccordSpec.JournalSpec(),
+ new TestCallbacks(),
+ new IdentityKeySerializer(),
+ new IdentityValueSerializer());
+ }),
+ () -> check());
}
- private static void run()
+ public static void check()
{
- for (int i = 0; i < State.events; i++)
+ State.journal.start();
+ try
+ {
+ for (int i = 0; i < 100; i++)
+ {
+ int finalI = i;
+ State.executor.submit(() -> State.journal.asyncWrite("test" + finalI, "test" + finalI, Collections.singleton(1), null));
+ }
+
+ State.latch.await();
+
+ for (int i = 0; i < 100; i++)
+ {
+ System.out.println("Reading " + State.journal.readFirst("test" + i));
Review Comment:
also goes to the right log file, simulator has its own logger configs =)
--
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.
To unsubscribe, e-mail: pr-unsubscribe@cassandra.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: pr-unsubscribe@cassandra.apache.org
For additional commands, e-mail: pr-help@cassandra.apache.org
Re: [PR] Bring back Journal simulator (w/o Accord at least for now); add semap… [cassandra]
Posted by "ifesdjeen (via GitHub)" <gi...@apache.org>.
ifesdjeen commented on code in PR #3408:
URL: https://github.com/apache/cassandra/pull/3408#discussion_r1677861163
##########
test/simulator/main/org/apache/cassandra/simulator/systems/InterceptingSemaphore.java:
##########
@@ -0,0 +1,187 @@
+/*
+ * 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.cassandra.simulator.systems;
+
+import java.util.Queue;
+import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import org.apache.cassandra.utils.Clock;
+import org.apache.cassandra.utils.concurrent.Semaphore;
+import org.apache.cassandra.utils.concurrent.UncheckedInterruptedException;
+
+import static org.apache.cassandra.simulator.systems.InterceptorOfGlobalMethods.Global.ifIntercepted;
+
+public class InterceptingSemaphore extends Semaphore.Standard
+{
+ final Queue<SemaphoreSignal> interceptible = new ConcurrentLinkedQueue<>();
+ final AtomicInteger permits;
+ final boolean fair;
+
+ private static class SemaphoreSignal extends InterceptingAwaitable.InterceptingSignal<Void>
+ {
+ private final int permits;
+
+ private SemaphoreSignal(int permits)
+ {
+ this.permits = permits;
+ }
+ }
+
+ public InterceptingSemaphore(int permits, boolean fair)
+ {
+ super(permits);
+ this.permits = new AtomicInteger(permits);
+ this.fair = fair;
+ }
+
+ @Override
+ public int permits()
+ {
+ if (ifIntercepted() == null)
+ return super.permits();
+
+ return permits.get();
+ }
+
+ @Override
+ public int drain()
+ {
+ if (ifIntercepted() == null)
+ return super.drain();
+
+ for (int i = 0; i < 10; i++)
+ {
+ int current = permits.get();
+ if (permits.compareAndSet(current, 0))
+ return current;
+ }
+
+ throw new IllegalStateException("Too much contention");
+ }
+
+ @Override
+ public void release(int release)
+ {
+ if (ifIntercepted() == null)
+ {
+ super.release(release);
+ return;
+ }
+
+ int remaining = permits.addAndGet(release);
+ while (!interceptible.isEmpty() && remaining > 0)
+ {
+ SemaphoreSignal signal = interceptible.peek();
+ if (signal.permits >= remaining)
+ interceptible.poll().signal();
+ else if (fair)
+ // Do not break enqueue order if using fair scheduler
+ break;
+ }
+ }
+
+ @Override
+ public boolean tryAcquire(int acquire)
+ {
+ if (ifIntercepted() == null)
+ return super.tryAcquire(acquire);
+
+ for (int i = 0; i < 10; i++)
+ {
+ int current = permits.get();
+ if (current >= acquire)
+ {
+ if (permits.compareAndSet(current, current - acquire))
+ return true;
+ }
+ else
+ {
+ return false;
+ }
+ }
+ throw new IllegalStateException("Too much contention");
+ }
+
+ @Override
+ public boolean tryAcquire(int acquire, long time, TimeUnit unit) throws InterruptedException
+ {
+ if (ifIntercepted() == null)
+ return super.tryAcquire(acquire, time, unit);
+
+ return tryAcquireUntil(acquire, Clock.Global.nanoTime() + unit.toNanos(time));
Review Comment:
I've double-checked with @belliottsmith, and using `nanoTIme` in the context of simulator is ok. That said, I did find a problem with the way we were simulating time for this specific test, and turned out that `System#nanoTime` was not intercepted. I've fixed this separately.
Also, for consistency of behaviors, I've switched to delegate time-related methods to awaitable that we already hold.
##########
test/simulator/main/org/apache/cassandra/simulator/systems/InterceptingSemaphore.java:
##########
@@ -0,0 +1,187 @@
+/*
+ * 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.cassandra.simulator.systems;
+
+import java.util.Queue;
+import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import org.apache.cassandra.utils.Clock;
+import org.apache.cassandra.utils.concurrent.Semaphore;
+import org.apache.cassandra.utils.concurrent.UncheckedInterruptedException;
+
+import static org.apache.cassandra.simulator.systems.InterceptorOfGlobalMethods.Global.ifIntercepted;
+
+public class InterceptingSemaphore extends Semaphore.Standard
+{
+ final Queue<SemaphoreSignal> interceptible = new ConcurrentLinkedQueue<>();
+ final AtomicInteger permits;
+ final boolean fair;
+
+ private static class SemaphoreSignal extends InterceptingAwaitable.InterceptingSignal<Void>
+ {
+ private final int permits;
+
+ private SemaphoreSignal(int permits)
+ {
+ this.permits = permits;
+ }
+ }
+
+ public InterceptingSemaphore(int permits, boolean fair)
+ {
+ super(permits);
+ this.permits = new AtomicInteger(permits);
+ this.fair = fair;
+ }
+
+ @Override
+ public int permits()
+ {
+ if (ifIntercepted() == null)
+ return super.permits();
+
+ return permits.get();
+ }
+
+ @Override
+ public int drain()
+ {
+ if (ifIntercepted() == null)
+ return super.drain();
+
+ for (int i = 0; i < 10; i++)
+ {
+ int current = permits.get();
+ if (permits.compareAndSet(current, 0))
+ return current;
+ }
+
+ throw new IllegalStateException("Too much contention");
+ }
+
+ @Override
+ public void release(int release)
+ {
+ if (ifIntercepted() == null)
+ {
+ super.release(release);
+ return;
+ }
+
+ int remaining = permits.addAndGet(release);
+ while (!interceptible.isEmpty() && remaining > 0)
+ {
+ SemaphoreSignal signal = interceptible.peek();
+ if (signal.permits >= remaining)
+ interceptible.poll().signal();
+ else if (fair)
+ // Do not break enqueue order if using fair scheduler
+ break;
+ }
+ }
+
+ @Override
+ public boolean tryAcquire(int acquire)
+ {
+ if (ifIntercepted() == null)
+ return super.tryAcquire(acquire);
+
+ for (int i = 0; i < 10; i++)
+ {
+ int current = permits.get();
+ if (current >= acquire)
+ {
+ if (permits.compareAndSet(current, current - acquire))
+ return true;
+ }
+ else
+ {
+ return false;
+ }
+ }
+ throw new IllegalStateException("Too much contention");
+ }
+
+ @Override
+ public boolean tryAcquire(int acquire, long time, TimeUnit unit) throws InterruptedException
+ {
+ if (ifIntercepted() == null)
+ return super.tryAcquire(acquire, time, unit);
+
+ return tryAcquireUntil(acquire, Clock.Global.nanoTime() + unit.toNanos(time));
+ }
+
+ @Override
+ public boolean tryAcquireUntil(int acquire, long deadline) throws InterruptedException
+ {
+ if (ifIntercepted() == null)
+ return super.tryAcquireUntil(acquire, deadline);
+
+ do
+ {
+ int current = permits.get();
+ if (current >= acquire)
+ {
+ if (permits.compareAndSet(current, current - acquire))
+ return true;
+ }
+ SemaphoreSignal signal = new SemaphoreSignal(acquire);
+ interceptible.add(signal);
+ signal.awaitUntil(deadline);
+ }
+ while (Clock.Global.nanoTime() < deadline);
Review Comment:
> if we waited until the deadline, then check again and not able to get the lock... shouldn't we stop right away? If we loop again are we not doing it wrong?
I don't think so. javadoc says "Try to take permits, waiting until the deadline", a opposed to "Take permits, waiting indefinitely until available". It does not specify you should wait for a single release. Default implementation does a `for (;;) {` loop.
--
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.
To unsubscribe, e-mail: pr-unsubscribe@cassandra.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: pr-unsubscribe@cassandra.apache.org
For additional commands, e-mail: pr-help@cassandra.apache.org
Re: [PR] Bring back Journal simulator (w/o Accord at least for now); add semap… [cassandra]
Posted by "ifesdjeen (via GitHub)" <gi...@apache.org>.
ifesdjeen closed pull request #3408: Bring back Journal simulator (w/o Accord at least for now); add semap…
URL: https://github.com/apache/cassandra/pull/3408
--
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.
To unsubscribe, e-mail: pr-unsubscribe@cassandra.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: pr-unsubscribe@cassandra.apache.org
For additional commands, e-mail: pr-help@cassandra.apache.org
Re: [PR] Bring back Journal simulator (w/o Accord at least for now); add semap… [cassandra]
Posted by "dcapwell (via GitHub)" <gi...@apache.org>.
dcapwell commented on code in PR #3408:
URL: https://github.com/apache/cassandra/pull/3408#discussion_r1669367320
##########
test/simulator/main/org/apache/cassandra/simulator/systems/InterceptorOfGlobalMethods.java:
##########
@@ -383,12 +404,12 @@ public static CountDownLatch newCountDownLatch(int count)
public static Semaphore newSemaphore(int count)
{
- return new Standard(count, false);
+ return methods.newSemaphore(count);
}
public static Semaphore newFairSemaphore(int count)
{
- return new Standard(count, true);
+ return methods.newSemaphore(count);
Review Comment:
```suggestion
return methods.newFairSemaphore(count);
```
this is doing `false`
--
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.
To unsubscribe, e-mail: pr-unsubscribe@cassandra.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: pr-unsubscribe@cassandra.apache.org
For additional commands, e-mail: pr-help@cassandra.apache.org
Re: [PR] Bring back Journal simulator (w/o Accord at least for now); add semap… [cassandra]
Posted by "dcapwell (via GitHub)" <gi...@apache.org>.
dcapwell commented on code in PR #3408:
URL: https://github.com/apache/cassandra/pull/3408#discussion_r1670810624
##########
test/simulator/test/org/apache/cassandra/simulator/test/AccordJournalSimulationTest.java:
##########
@@ -18,250 +18,359 @@
package org.apache.cassandra.simulator.test;
import java.io.IOException;
-import java.util.List;
-import java.util.UUID;
-import java.util.concurrent.CopyOnWriteArrayList;
+import java.nio.ByteBuffer;
+import java.util.Collections;
+import java.util.Optional;
+import java.util.Set;
+import java.util.zip.Checksum;
import javax.annotation.Nullable;
import com.google.common.collect.ImmutableMap;
+import com.google.common.jimfs.Jimfs;
-import accord.topology.TopologyUtils;
+import org.apache.cassandra.concurrent.ExecutorFactory;
+import org.apache.cassandra.concurrent.ExecutorPlus;
import org.apache.cassandra.config.AccordSpec;
+import org.apache.cassandra.config.Config;
+import org.apache.cassandra.db.TypeSizes;
+import org.apache.cassandra.distributed.test.log.CMSTestBase;
+import org.apache.cassandra.harry.sut.TokenPlacementModel;
+import org.apache.cassandra.io.filesystem.ListenableFileSystem;
+import org.apache.cassandra.io.util.DataInputPlus;
+import org.apache.cassandra.io.util.DataOutputPlus;
+import org.apache.cassandra.journal.AsyncCallbacks;
+import org.apache.cassandra.journal.Journal;
+import org.apache.cassandra.journal.KeySupport;
+import org.apache.cassandra.journal.ValueSerializer;
import org.apache.cassandra.schema.*;
-import org.junit.Ignore;
+
+import org.junit.Assert;
import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import accord.Utils;
-import accord.api.Data;
-import accord.api.RoutingKey;
-import accord.api.Update;
-import accord.api.Write;
-import accord.local.Node;
-import accord.messages.MessageType;
-import accord.messages.PreAccept;
-import accord.messages.TxnRequest;
-import accord.primitives.FullKeyRoute;
-import accord.primitives.FullRoute;
-import accord.primitives.Keys;
-import accord.primitives.Ranges;
-import accord.primitives.Seekables;
-import accord.primitives.Timestamp;
-import accord.primitives.Txn;
-import accord.primitives.TxnId;
-import accord.topology.Topologies;
-import org.apache.cassandra.concurrent.ExecutorFactory;
-import org.apache.cassandra.concurrent.ExecutorPlus;
+
import org.apache.cassandra.config.DatabaseDescriptor;
import org.apache.cassandra.config.ParameterizedClass;
-import org.apache.cassandra.db.ColumnFamilyStore;
import org.apache.cassandra.db.Keyspace;
-import org.apache.cassandra.db.commitlog.CommitLog;
-import org.apache.cassandra.db.marshal.Int32Type;
import org.apache.cassandra.dht.Murmur3Partitioner;
import org.apache.cassandra.io.util.File;
-import org.apache.cassandra.io.util.Files;
-import org.apache.cassandra.service.accord.AccordJournal;
-import org.apache.cassandra.service.accord.TokenRange;
-import org.apache.cassandra.service.accord.api.AccordRoutingKey;
-import org.apache.cassandra.service.accord.api.PartitionKey;
-import org.apache.cassandra.service.accord.txn.TxnNamedRead;
-import org.apache.cassandra.service.accord.txn.TxnQuery;
-import org.apache.cassandra.service.accord.txn.TxnRead;
-import org.apache.cassandra.utils.ByteBufferUtil;
+import org.apache.cassandra.tcm.AtomicLongBackedProcessor;
+import org.apache.cassandra.tcm.ClusterMetadata;
import org.apache.cassandra.utils.Isolated;
import org.apache.cassandra.utils.concurrent.CountDownLatch;
public class AccordJournalSimulationTest extends SimulationTestBase
{
@Test
- @Ignore // TODO: re-enable
- public void test() throws IOException
+ public void simpleRWTest() throws IOException
{
- simulate(arr(() -> run()),
- () -> check());
+ simulate(arr(() -> {
+ ListenableFileSystem fs = new ListenableFileSystem(Jimfs.newFileSystem());
+ File.unsafeSetFilesystem(fs);
+ DatabaseDescriptor.daemonInitialization();
+ DatabaseDescriptor.setCommitLogCompression(new ParameterizedClass("LZ4Compressor", ImmutableMap.of())); //
+ DatabaseDescriptor.setCommitLogWriteDiskAccessMode(Config.DiskAccessMode.standard);
+ DatabaseDescriptor.initializeCommitLogDiskAccessMode();
+ System.out.println("DatabaseDescriptor.getCommitLogWriteDiskAccessMode() = " + DatabaseDescriptor.getCommitLogWriteDiskAccessMode());
+
+ DatabaseDescriptor.setPartitionerUnsafe(Murmur3Partitioner.instance);
+ long seed = 1L;
Review Comment:
dead code?
##########
test/simulator/test/org/apache/cassandra/simulator/test/AccordJournalSimulationTest.java:
##########
@@ -18,250 +18,359 @@
package org.apache.cassandra.simulator.test;
import java.io.IOException;
-import java.util.List;
-import java.util.UUID;
-import java.util.concurrent.CopyOnWriteArrayList;
+import java.nio.ByteBuffer;
+import java.util.Collections;
+import java.util.Optional;
+import java.util.Set;
+import java.util.zip.Checksum;
import javax.annotation.Nullable;
import com.google.common.collect.ImmutableMap;
+import com.google.common.jimfs.Jimfs;
-import accord.topology.TopologyUtils;
+import org.apache.cassandra.concurrent.ExecutorFactory;
+import org.apache.cassandra.concurrent.ExecutorPlus;
import org.apache.cassandra.config.AccordSpec;
+import org.apache.cassandra.config.Config;
+import org.apache.cassandra.db.TypeSizes;
+import org.apache.cassandra.distributed.test.log.CMSTestBase;
+import org.apache.cassandra.harry.sut.TokenPlacementModel;
+import org.apache.cassandra.io.filesystem.ListenableFileSystem;
+import org.apache.cassandra.io.util.DataInputPlus;
+import org.apache.cassandra.io.util.DataOutputPlus;
+import org.apache.cassandra.journal.AsyncCallbacks;
+import org.apache.cassandra.journal.Journal;
+import org.apache.cassandra.journal.KeySupport;
+import org.apache.cassandra.journal.ValueSerializer;
import org.apache.cassandra.schema.*;
-import org.junit.Ignore;
+
+import org.junit.Assert;
import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import accord.Utils;
-import accord.api.Data;
-import accord.api.RoutingKey;
-import accord.api.Update;
-import accord.api.Write;
-import accord.local.Node;
-import accord.messages.MessageType;
-import accord.messages.PreAccept;
-import accord.messages.TxnRequest;
-import accord.primitives.FullKeyRoute;
-import accord.primitives.FullRoute;
-import accord.primitives.Keys;
-import accord.primitives.Ranges;
-import accord.primitives.Seekables;
-import accord.primitives.Timestamp;
-import accord.primitives.Txn;
-import accord.primitives.TxnId;
-import accord.topology.Topologies;
-import org.apache.cassandra.concurrent.ExecutorFactory;
-import org.apache.cassandra.concurrent.ExecutorPlus;
+
import org.apache.cassandra.config.DatabaseDescriptor;
import org.apache.cassandra.config.ParameterizedClass;
-import org.apache.cassandra.db.ColumnFamilyStore;
import org.apache.cassandra.db.Keyspace;
-import org.apache.cassandra.db.commitlog.CommitLog;
-import org.apache.cassandra.db.marshal.Int32Type;
import org.apache.cassandra.dht.Murmur3Partitioner;
import org.apache.cassandra.io.util.File;
-import org.apache.cassandra.io.util.Files;
-import org.apache.cassandra.service.accord.AccordJournal;
-import org.apache.cassandra.service.accord.TokenRange;
-import org.apache.cassandra.service.accord.api.AccordRoutingKey;
-import org.apache.cassandra.service.accord.api.PartitionKey;
-import org.apache.cassandra.service.accord.txn.TxnNamedRead;
-import org.apache.cassandra.service.accord.txn.TxnQuery;
-import org.apache.cassandra.service.accord.txn.TxnRead;
-import org.apache.cassandra.utils.ByteBufferUtil;
+import org.apache.cassandra.tcm.AtomicLongBackedProcessor;
+import org.apache.cassandra.tcm.ClusterMetadata;
import org.apache.cassandra.utils.Isolated;
import org.apache.cassandra.utils.concurrent.CountDownLatch;
public class AccordJournalSimulationTest extends SimulationTestBase
{
@Test
- @Ignore // TODO: re-enable
- public void test() throws IOException
+ public void simpleRWTest() throws IOException
{
- simulate(arr(() -> run()),
- () -> check());
+ simulate(arr(() -> {
+ ListenableFileSystem fs = new ListenableFileSystem(Jimfs.newFileSystem());
+ File.unsafeSetFilesystem(fs);
+ DatabaseDescriptor.daemonInitialization();
+ DatabaseDescriptor.setCommitLogCompression(new ParameterizedClass("LZ4Compressor", ImmutableMap.of())); //
+ DatabaseDescriptor.setCommitLogWriteDiskAccessMode(Config.DiskAccessMode.standard);
+ DatabaseDescriptor.initializeCommitLogDiskAccessMode();
+ System.out.println("DatabaseDescriptor.getCommitLogWriteDiskAccessMode() = " + DatabaseDescriptor.getCommitLogWriteDiskAccessMode());
+
+ DatabaseDescriptor.setPartitionerUnsafe(Murmur3Partitioner.instance);
+ long seed = 1L;
+ DatabaseDescriptor.setAccordJournalDirectory("/journal");
+ new File("/journal").createDirectoriesIfNotExists();
+
+ DatabaseDescriptor.setDumpHeapOnUncaughtException(false);
+
+ Keyspace.setInitialized();
+
+ CMSTestBase.CMSSut sut = new CMSTestBase.CMSSut(AtomicLongBackedProcessor::new,
+ false,
+ new FakeSchema(),
+ new TokenPlacementModel.SimpleReplicationFactor(1));
+
+ State.journal = new Journal<>("AccordJournal",
+ new File("/journal"),
+ new AccordSpec.JournalSpec(),
+ new TestCallbacks(),
+ new IdentityKeySerializer(),
+ new IdentityValueSerializer());
+ }),
+ () -> check());
}
- private static void run()
+ public static void check()
Review Comment:
having the check be the test and not the validation is much cleaner, good idea
##########
test/simulator/test/org/apache/cassandra/simulator/test/AccordJournalSimulationTest.java:
##########
@@ -18,250 +18,359 @@
package org.apache.cassandra.simulator.test;
import java.io.IOException;
-import java.util.List;
-import java.util.UUID;
-import java.util.concurrent.CopyOnWriteArrayList;
+import java.nio.ByteBuffer;
+import java.util.Collections;
+import java.util.Optional;
+import java.util.Set;
+import java.util.zip.Checksum;
import javax.annotation.Nullable;
import com.google.common.collect.ImmutableMap;
+import com.google.common.jimfs.Jimfs;
-import accord.topology.TopologyUtils;
+import org.apache.cassandra.concurrent.ExecutorFactory;
+import org.apache.cassandra.concurrent.ExecutorPlus;
import org.apache.cassandra.config.AccordSpec;
+import org.apache.cassandra.config.Config;
+import org.apache.cassandra.db.TypeSizes;
+import org.apache.cassandra.distributed.test.log.CMSTestBase;
+import org.apache.cassandra.harry.sut.TokenPlacementModel;
+import org.apache.cassandra.io.filesystem.ListenableFileSystem;
+import org.apache.cassandra.io.util.DataInputPlus;
+import org.apache.cassandra.io.util.DataOutputPlus;
+import org.apache.cassandra.journal.AsyncCallbacks;
+import org.apache.cassandra.journal.Journal;
+import org.apache.cassandra.journal.KeySupport;
+import org.apache.cassandra.journal.ValueSerializer;
import org.apache.cassandra.schema.*;
-import org.junit.Ignore;
+
+import org.junit.Assert;
import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import accord.Utils;
-import accord.api.Data;
-import accord.api.RoutingKey;
-import accord.api.Update;
-import accord.api.Write;
-import accord.local.Node;
-import accord.messages.MessageType;
-import accord.messages.PreAccept;
-import accord.messages.TxnRequest;
-import accord.primitives.FullKeyRoute;
-import accord.primitives.FullRoute;
-import accord.primitives.Keys;
-import accord.primitives.Ranges;
-import accord.primitives.Seekables;
-import accord.primitives.Timestamp;
-import accord.primitives.Txn;
-import accord.primitives.TxnId;
-import accord.topology.Topologies;
-import org.apache.cassandra.concurrent.ExecutorFactory;
-import org.apache.cassandra.concurrent.ExecutorPlus;
+
import org.apache.cassandra.config.DatabaseDescriptor;
import org.apache.cassandra.config.ParameterizedClass;
-import org.apache.cassandra.db.ColumnFamilyStore;
import org.apache.cassandra.db.Keyspace;
-import org.apache.cassandra.db.commitlog.CommitLog;
-import org.apache.cassandra.db.marshal.Int32Type;
import org.apache.cassandra.dht.Murmur3Partitioner;
import org.apache.cassandra.io.util.File;
-import org.apache.cassandra.io.util.Files;
-import org.apache.cassandra.service.accord.AccordJournal;
-import org.apache.cassandra.service.accord.TokenRange;
-import org.apache.cassandra.service.accord.api.AccordRoutingKey;
-import org.apache.cassandra.service.accord.api.PartitionKey;
-import org.apache.cassandra.service.accord.txn.TxnNamedRead;
-import org.apache.cassandra.service.accord.txn.TxnQuery;
-import org.apache.cassandra.service.accord.txn.TxnRead;
-import org.apache.cassandra.utils.ByteBufferUtil;
+import org.apache.cassandra.tcm.AtomicLongBackedProcessor;
+import org.apache.cassandra.tcm.ClusterMetadata;
import org.apache.cassandra.utils.Isolated;
import org.apache.cassandra.utils.concurrent.CountDownLatch;
public class AccordJournalSimulationTest extends SimulationTestBase
{
@Test
- @Ignore // TODO: re-enable
- public void test() throws IOException
+ public void simpleRWTest() throws IOException
{
- simulate(arr(() -> run()),
- () -> check());
+ simulate(arr(() -> {
+ ListenableFileSystem fs = new ListenableFileSystem(Jimfs.newFileSystem());
+ File.unsafeSetFilesystem(fs);
+ DatabaseDescriptor.daemonInitialization();
+ DatabaseDescriptor.setCommitLogCompression(new ParameterizedClass("LZ4Compressor", ImmutableMap.of())); //
+ DatabaseDescriptor.setCommitLogWriteDiskAccessMode(Config.DiskAccessMode.standard);
+ DatabaseDescriptor.initializeCommitLogDiskAccessMode();
+ System.out.println("DatabaseDescriptor.getCommitLogWriteDiskAccessMode() = " + DatabaseDescriptor.getCommitLogWriteDiskAccessMode());
+
+ DatabaseDescriptor.setPartitionerUnsafe(Murmur3Partitioner.instance);
+ long seed = 1L;
+ DatabaseDescriptor.setAccordJournalDirectory("/journal");
+ new File("/journal").createDirectoriesIfNotExists();
+
+ DatabaseDescriptor.setDumpHeapOnUncaughtException(false);
+
+ Keyspace.setInitialized();
+
+ CMSTestBase.CMSSut sut = new CMSTestBase.CMSSut(AtomicLongBackedProcessor::new,
+ false,
+ new FakeSchema(),
+ new TokenPlacementModel.SimpleReplicationFactor(1));
Review Comment:
dead code?
##########
test/simulator/test/org/apache/cassandra/simulator/test/AccordJournalSimulationTest.java:
##########
@@ -18,250 +18,359 @@
package org.apache.cassandra.simulator.test;
import java.io.IOException;
-import java.util.List;
-import java.util.UUID;
-import java.util.concurrent.CopyOnWriteArrayList;
+import java.nio.ByteBuffer;
+import java.util.Collections;
+import java.util.Optional;
+import java.util.Set;
+import java.util.zip.Checksum;
import javax.annotation.Nullable;
import com.google.common.collect.ImmutableMap;
+import com.google.common.jimfs.Jimfs;
-import accord.topology.TopologyUtils;
+import org.apache.cassandra.concurrent.ExecutorFactory;
+import org.apache.cassandra.concurrent.ExecutorPlus;
import org.apache.cassandra.config.AccordSpec;
+import org.apache.cassandra.config.Config;
+import org.apache.cassandra.db.TypeSizes;
+import org.apache.cassandra.distributed.test.log.CMSTestBase;
+import org.apache.cassandra.harry.sut.TokenPlacementModel;
+import org.apache.cassandra.io.filesystem.ListenableFileSystem;
+import org.apache.cassandra.io.util.DataInputPlus;
+import org.apache.cassandra.io.util.DataOutputPlus;
+import org.apache.cassandra.journal.AsyncCallbacks;
+import org.apache.cassandra.journal.Journal;
+import org.apache.cassandra.journal.KeySupport;
+import org.apache.cassandra.journal.ValueSerializer;
import org.apache.cassandra.schema.*;
-import org.junit.Ignore;
+
+import org.junit.Assert;
import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import accord.Utils;
-import accord.api.Data;
-import accord.api.RoutingKey;
-import accord.api.Update;
-import accord.api.Write;
-import accord.local.Node;
-import accord.messages.MessageType;
-import accord.messages.PreAccept;
-import accord.messages.TxnRequest;
-import accord.primitives.FullKeyRoute;
-import accord.primitives.FullRoute;
-import accord.primitives.Keys;
-import accord.primitives.Ranges;
-import accord.primitives.Seekables;
-import accord.primitives.Timestamp;
-import accord.primitives.Txn;
-import accord.primitives.TxnId;
-import accord.topology.Topologies;
-import org.apache.cassandra.concurrent.ExecutorFactory;
-import org.apache.cassandra.concurrent.ExecutorPlus;
+
import org.apache.cassandra.config.DatabaseDescriptor;
import org.apache.cassandra.config.ParameterizedClass;
-import org.apache.cassandra.db.ColumnFamilyStore;
import org.apache.cassandra.db.Keyspace;
-import org.apache.cassandra.db.commitlog.CommitLog;
-import org.apache.cassandra.db.marshal.Int32Type;
import org.apache.cassandra.dht.Murmur3Partitioner;
import org.apache.cassandra.io.util.File;
-import org.apache.cassandra.io.util.Files;
-import org.apache.cassandra.service.accord.AccordJournal;
-import org.apache.cassandra.service.accord.TokenRange;
-import org.apache.cassandra.service.accord.api.AccordRoutingKey;
-import org.apache.cassandra.service.accord.api.PartitionKey;
-import org.apache.cassandra.service.accord.txn.TxnNamedRead;
-import org.apache.cassandra.service.accord.txn.TxnQuery;
-import org.apache.cassandra.service.accord.txn.TxnRead;
-import org.apache.cassandra.utils.ByteBufferUtil;
+import org.apache.cassandra.tcm.AtomicLongBackedProcessor;
+import org.apache.cassandra.tcm.ClusterMetadata;
import org.apache.cassandra.utils.Isolated;
import org.apache.cassandra.utils.concurrent.CountDownLatch;
public class AccordJournalSimulationTest extends SimulationTestBase
{
@Test
- @Ignore // TODO: re-enable
- public void test() throws IOException
+ public void simpleRWTest() throws IOException
{
- simulate(arr(() -> run()),
- () -> check());
+ simulate(arr(() -> {
+ ListenableFileSystem fs = new ListenableFileSystem(Jimfs.newFileSystem());
+ File.unsafeSetFilesystem(fs);
+ DatabaseDescriptor.daemonInitialization();
+ DatabaseDescriptor.setCommitLogCompression(new ParameterizedClass("LZ4Compressor", ImmutableMap.of())); //
+ DatabaseDescriptor.setCommitLogWriteDiskAccessMode(Config.DiskAccessMode.standard);
+ DatabaseDescriptor.initializeCommitLogDiskAccessMode();
+ System.out.println("DatabaseDescriptor.getCommitLogWriteDiskAccessMode() = " + DatabaseDescriptor.getCommitLogWriteDiskAccessMode());
Review Comment:
Logger please
##########
test/simulator/test/org/apache/cassandra/simulator/test/AccordJournalSimulationTest.java:
##########
@@ -18,250 +18,359 @@
package org.apache.cassandra.simulator.test;
import java.io.IOException;
-import java.util.List;
-import java.util.UUID;
-import java.util.concurrent.CopyOnWriteArrayList;
+import java.nio.ByteBuffer;
+import java.util.Collections;
+import java.util.Optional;
+import java.util.Set;
+import java.util.zip.Checksum;
import javax.annotation.Nullable;
import com.google.common.collect.ImmutableMap;
+import com.google.common.jimfs.Jimfs;
-import accord.topology.TopologyUtils;
+import org.apache.cassandra.concurrent.ExecutorFactory;
+import org.apache.cassandra.concurrent.ExecutorPlus;
import org.apache.cassandra.config.AccordSpec;
+import org.apache.cassandra.config.Config;
+import org.apache.cassandra.db.TypeSizes;
+import org.apache.cassandra.distributed.test.log.CMSTestBase;
+import org.apache.cassandra.harry.sut.TokenPlacementModel;
+import org.apache.cassandra.io.filesystem.ListenableFileSystem;
+import org.apache.cassandra.io.util.DataInputPlus;
+import org.apache.cassandra.io.util.DataOutputPlus;
+import org.apache.cassandra.journal.AsyncCallbacks;
+import org.apache.cassandra.journal.Journal;
+import org.apache.cassandra.journal.KeySupport;
+import org.apache.cassandra.journal.ValueSerializer;
import org.apache.cassandra.schema.*;
-import org.junit.Ignore;
+
+import org.junit.Assert;
import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import accord.Utils;
-import accord.api.Data;
-import accord.api.RoutingKey;
-import accord.api.Update;
-import accord.api.Write;
-import accord.local.Node;
-import accord.messages.MessageType;
-import accord.messages.PreAccept;
-import accord.messages.TxnRequest;
-import accord.primitives.FullKeyRoute;
-import accord.primitives.FullRoute;
-import accord.primitives.Keys;
-import accord.primitives.Ranges;
-import accord.primitives.Seekables;
-import accord.primitives.Timestamp;
-import accord.primitives.Txn;
-import accord.primitives.TxnId;
-import accord.topology.Topologies;
-import org.apache.cassandra.concurrent.ExecutorFactory;
-import org.apache.cassandra.concurrent.ExecutorPlus;
+
import org.apache.cassandra.config.DatabaseDescriptor;
import org.apache.cassandra.config.ParameterizedClass;
-import org.apache.cassandra.db.ColumnFamilyStore;
import org.apache.cassandra.db.Keyspace;
-import org.apache.cassandra.db.commitlog.CommitLog;
-import org.apache.cassandra.db.marshal.Int32Type;
import org.apache.cassandra.dht.Murmur3Partitioner;
import org.apache.cassandra.io.util.File;
-import org.apache.cassandra.io.util.Files;
-import org.apache.cassandra.service.accord.AccordJournal;
-import org.apache.cassandra.service.accord.TokenRange;
-import org.apache.cassandra.service.accord.api.AccordRoutingKey;
-import org.apache.cassandra.service.accord.api.PartitionKey;
-import org.apache.cassandra.service.accord.txn.TxnNamedRead;
-import org.apache.cassandra.service.accord.txn.TxnQuery;
-import org.apache.cassandra.service.accord.txn.TxnRead;
-import org.apache.cassandra.utils.ByteBufferUtil;
+import org.apache.cassandra.tcm.AtomicLongBackedProcessor;
+import org.apache.cassandra.tcm.ClusterMetadata;
import org.apache.cassandra.utils.Isolated;
import org.apache.cassandra.utils.concurrent.CountDownLatch;
public class AccordJournalSimulationTest extends SimulationTestBase
{
@Test
- @Ignore // TODO: re-enable
- public void test() throws IOException
+ public void simpleRWTest() throws IOException
{
- simulate(arr(() -> run()),
- () -> check());
+ simulate(arr(() -> {
+ ListenableFileSystem fs = new ListenableFileSystem(Jimfs.newFileSystem());
+ File.unsafeSetFilesystem(fs);
+ DatabaseDescriptor.daemonInitialization();
+ DatabaseDescriptor.setCommitLogCompression(new ParameterizedClass("LZ4Compressor", ImmutableMap.of())); //
+ DatabaseDescriptor.setCommitLogWriteDiskAccessMode(Config.DiskAccessMode.standard);
+ DatabaseDescriptor.initializeCommitLogDiskAccessMode();
+ System.out.println("DatabaseDescriptor.getCommitLogWriteDiskAccessMode() = " + DatabaseDescriptor.getCommitLogWriteDiskAccessMode());
+
+ DatabaseDescriptor.setPartitionerUnsafe(Murmur3Partitioner.instance);
+ long seed = 1L;
+ DatabaseDescriptor.setAccordJournalDirectory("/journal");
+ new File("/journal").createDirectoriesIfNotExists();
+
+ DatabaseDescriptor.setDumpHeapOnUncaughtException(false);
+
+ Keyspace.setInitialized();
+
+ CMSTestBase.CMSSut sut = new CMSTestBase.CMSSut(AtomicLongBackedProcessor::new,
+ false,
+ new FakeSchema(),
+ new TokenPlacementModel.SimpleReplicationFactor(1));
+
+ State.journal = new Journal<>("AccordJournal",
+ new File("/journal"),
+ new AccordSpec.JournalSpec(),
+ new TestCallbacks(),
+ new IdentityKeySerializer(),
+ new IdentityValueSerializer());
+ }),
+ () -> check());
}
- private static void run()
+ public static void check()
{
- for (int i = 0; i < State.events; i++)
+ State.journal.start();
+ try
+ {
+ for (int i = 0; i < 100; i++)
+ {
+ int finalI = i;
+ State.executor.submit(() -> State.journal.asyncWrite("test" + finalI, "test" + finalI, Collections.singleton(1), null));
+ }
+
+ State.latch.await();
+
+ for (int i = 0; i < 100; i++)
+ {
+ System.out.println("Reading " + State.journal.readFirst("test" + i));
+ Assert.assertEquals(State.journal.readFirst("test" + i), "test" + i);
+ }
+ }
+ catch (Throwable e)
{
- int finalI = i;
- State.executor.execute(() -> State.append(finalI));
+ e.printStackTrace();
}
+ finally
+ {
+ State.journal.shutdown();
+ }
+ }
- try
+ public static class TestCallbacks implements AsyncCallbacks<String, String>
+ {
+
+ @Override
+ public void onWrite(long segment, int position, int size, String key, String value, Object writeContext)
{
- State.eventsDurable.await();
- State.logger.info("All events are durable done!");
+ State.latch.decrement();
}
- catch (InterruptedException e)
+
+ @Override
+ public void onWriteFailed(String key, String value, Object writeContext, Throwable cause)
{
- throw new AssertionError(e);
+ State.latch.decrement();
Review Comment:
this is a big issue as the test could pass and this will be ignored. You should save this to `State` and assert this in the test. Any failures is unexpected and should lead to a test fault
##########
test/simulator/test/org/apache/cassandra/simulator/test/AccordJournalSimulationTest.java:
##########
@@ -18,250 +18,359 @@
package org.apache.cassandra.simulator.test;
import java.io.IOException;
-import java.util.List;
-import java.util.UUID;
-import java.util.concurrent.CopyOnWriteArrayList;
+import java.nio.ByteBuffer;
+import java.util.Collections;
+import java.util.Optional;
+import java.util.Set;
+import java.util.zip.Checksum;
import javax.annotation.Nullable;
import com.google.common.collect.ImmutableMap;
+import com.google.common.jimfs.Jimfs;
-import accord.topology.TopologyUtils;
+import org.apache.cassandra.concurrent.ExecutorFactory;
+import org.apache.cassandra.concurrent.ExecutorPlus;
import org.apache.cassandra.config.AccordSpec;
+import org.apache.cassandra.config.Config;
+import org.apache.cassandra.db.TypeSizes;
+import org.apache.cassandra.distributed.test.log.CMSTestBase;
+import org.apache.cassandra.harry.sut.TokenPlacementModel;
+import org.apache.cassandra.io.filesystem.ListenableFileSystem;
+import org.apache.cassandra.io.util.DataInputPlus;
+import org.apache.cassandra.io.util.DataOutputPlus;
+import org.apache.cassandra.journal.AsyncCallbacks;
+import org.apache.cassandra.journal.Journal;
+import org.apache.cassandra.journal.KeySupport;
+import org.apache.cassandra.journal.ValueSerializer;
import org.apache.cassandra.schema.*;
-import org.junit.Ignore;
+
+import org.junit.Assert;
import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import accord.Utils;
-import accord.api.Data;
-import accord.api.RoutingKey;
-import accord.api.Update;
-import accord.api.Write;
-import accord.local.Node;
-import accord.messages.MessageType;
-import accord.messages.PreAccept;
-import accord.messages.TxnRequest;
-import accord.primitives.FullKeyRoute;
-import accord.primitives.FullRoute;
-import accord.primitives.Keys;
-import accord.primitives.Ranges;
-import accord.primitives.Seekables;
-import accord.primitives.Timestamp;
-import accord.primitives.Txn;
-import accord.primitives.TxnId;
-import accord.topology.Topologies;
-import org.apache.cassandra.concurrent.ExecutorFactory;
-import org.apache.cassandra.concurrent.ExecutorPlus;
+
import org.apache.cassandra.config.DatabaseDescriptor;
import org.apache.cassandra.config.ParameterizedClass;
-import org.apache.cassandra.db.ColumnFamilyStore;
import org.apache.cassandra.db.Keyspace;
-import org.apache.cassandra.db.commitlog.CommitLog;
-import org.apache.cassandra.db.marshal.Int32Type;
import org.apache.cassandra.dht.Murmur3Partitioner;
import org.apache.cassandra.io.util.File;
-import org.apache.cassandra.io.util.Files;
-import org.apache.cassandra.service.accord.AccordJournal;
-import org.apache.cassandra.service.accord.TokenRange;
-import org.apache.cassandra.service.accord.api.AccordRoutingKey;
-import org.apache.cassandra.service.accord.api.PartitionKey;
-import org.apache.cassandra.service.accord.txn.TxnNamedRead;
-import org.apache.cassandra.service.accord.txn.TxnQuery;
-import org.apache.cassandra.service.accord.txn.TxnRead;
-import org.apache.cassandra.utils.ByteBufferUtil;
+import org.apache.cassandra.tcm.AtomicLongBackedProcessor;
+import org.apache.cassandra.tcm.ClusterMetadata;
import org.apache.cassandra.utils.Isolated;
import org.apache.cassandra.utils.concurrent.CountDownLatch;
public class AccordJournalSimulationTest extends SimulationTestBase
{
@Test
- @Ignore // TODO: re-enable
- public void test() throws IOException
+ public void simpleRWTest() throws IOException
{
- simulate(arr(() -> run()),
- () -> check());
+ simulate(arr(() -> {
+ ListenableFileSystem fs = new ListenableFileSystem(Jimfs.newFileSystem());
+ File.unsafeSetFilesystem(fs);
+ DatabaseDescriptor.daemonInitialization();
+ DatabaseDescriptor.setCommitLogCompression(new ParameterizedClass("LZ4Compressor", ImmutableMap.of())); //
+ DatabaseDescriptor.setCommitLogWriteDiskAccessMode(Config.DiskAccessMode.standard);
+ DatabaseDescriptor.initializeCommitLogDiskAccessMode();
+ System.out.println("DatabaseDescriptor.getCommitLogWriteDiskAccessMode() = " + DatabaseDescriptor.getCommitLogWriteDiskAccessMode());
+
+ DatabaseDescriptor.setPartitionerUnsafe(Murmur3Partitioner.instance);
+ long seed = 1L;
+ DatabaseDescriptor.setAccordJournalDirectory("/journal");
+ new File("/journal").createDirectoriesIfNotExists();
+
+ DatabaseDescriptor.setDumpHeapOnUncaughtException(false);
+
+ Keyspace.setInitialized();
+
+ CMSTestBase.CMSSut sut = new CMSTestBase.CMSSut(AtomicLongBackedProcessor::new,
+ false,
+ new FakeSchema(),
+ new TokenPlacementModel.SimpleReplicationFactor(1));
+
+ State.journal = new Journal<>("AccordJournal",
+ new File("/journal"),
+ new AccordSpec.JournalSpec(),
+ new TestCallbacks(),
+ new IdentityKeySerializer(),
+ new IdentityValueSerializer());
+ }),
+ () -> check());
}
- private static void run()
+ public static void check()
{
- for (int i = 0; i < State.events; i++)
+ State.journal.start();
+ try
+ {
+ for (int i = 0; i < 100; i++)
+ {
+ int finalI = i;
+ State.executor.submit(() -> State.journal.asyncWrite("test" + finalI, "test" + finalI, Collections.singleton(1), null));
+ }
+
+ State.latch.await();
+
+ for (int i = 0; i < 100; i++)
+ {
+ System.out.println("Reading " + State.journal.readFirst("test" + i));
+ Assert.assertEquals(State.journal.readFirst("test" + i), "test" + i);
+ }
+ }
+ catch (Throwable e)
{
- int finalI = i;
- State.executor.execute(() -> State.append(finalI));
+ e.printStackTrace();
}
+ finally
+ {
+ State.journal.shutdown();
+ }
+ }
- try
+ public static class TestCallbacks implements AsyncCallbacks<String, String>
+ {
+
+ @Override
+ public void onWrite(long segment, int position, int size, String key, String value, Object writeContext)
{
- State.eventsDurable.await();
- State.logger.info("All events are durable done!");
+ State.latch.decrement();
}
- catch (InterruptedException e)
+
+ @Override
+ public void onWriteFailed(String key, String value, Object writeContext, Throwable cause)
{
- throw new AssertionError(e);
+ State.latch.decrement();
}
- if (!State.exceptions.isEmpty())
+ @Override
+ public void onFlush(long segment, int position)
{
- AssertionError error = new AssertionError("Exceptions found during test");
- State.exceptions.forEach(error::addSuppressed);
- throw error;
}
- State.journal.shutdown();
- State.logger.info("Run complete");
+ @Override
+ public void onFlushFailed(Throwable cause)
+ {
+ new RuntimeException("Could not flush", cause).printStackTrace();
+ }
}
- private static void check()
+ @Isolated
+ public static class IdentityValueSerializer implements ValueSerializer<String, String>
{
- State.logger.info("Check starting");
- State.journal.start(null); // to avoid a while true deadlock
- try
+
+ @Override
+ public int serializedSize(String key, String value, int userVersion)
{
- for (int i = 0; i < State.events; i++)
- {
- TxnRequest<?> event = State.journal.readMessage(State.toTxnId(i), MessageType.PRE_ACCEPT_REQ, PreAccept.class);
- State.logger.info("Event {} -> {}", i, event);
- if (event == null)
- throw new AssertionError(String.format("Unable to read event %d", i));
- }
- State.logger.info("Check complete");
+ return TypeSizes.INT_SIZE + key.length();
}
- finally
+
+ @Override
+ public void serialize(String key, String value, DataOutputPlus out, int userVersion) throws IOException
{
- State.journal.shutdown();
+ out.writeInt(key.length());
+ out.writeBytes(key);
+ }
+
+ @Override
+ public String deserialize(String key, DataInputPlus in, int userVersion) throws IOException
+ {
+ int size = in.readInt();
+ byte[] value = new byte[size];
+ for (int i = 0; i < size; i++)
+ value[i] = in.readByte();
+
+ return new String(value);
+ }
+ }
+
+ @Isolated
+ public static class IdentityKeySerializer implements KeySupport<String>
+ {
+
+ @Override
+ public int serializedSize(int userVersion)
+ {
+ return 16;
+ }
+
+ @Override
+ public void serialize(String key, DataOutputPlus out, int userVersion) throws IOException
+ {
+ int maxSize = 16 - TypeSizes.INT_SIZE;
+ if (key.length() > maxSize)
+ throw new IllegalStateException();
+
+ out.writeInt(key.length());
+ out.writeBytes(key);
+ int remaining = maxSize - key.length();
+ for (int i = 0; i < remaining; i++)
+ out.writeByte(0);
+ }
+
+ @Override
+ public String deserialize(DataInputPlus in, int userVersion) throws IOException
+ {
+ int size = in.readInt();
+ byte[] key = new byte[size];
+ for (int i = 0; i < size; i++)
+ key[i] = in.readByte();
+
+ int maxSize = 16 - TypeSizes.INT_SIZE;
+ int remaining = maxSize - size;
+ for (int i = 0; i < remaining; i++)
+ in.readByte(); // todo assert 0
Review Comment:
want to fix the todo? Also `0` is common so could be good to use another value like `4` (randomly selected from XKCD)
##########
test/simulator/test/org/apache/cassandra/simulator/test/AccordJournalSimulationTest.java:
##########
@@ -18,250 +18,359 @@
package org.apache.cassandra.simulator.test;
import java.io.IOException;
-import java.util.List;
-import java.util.UUID;
-import java.util.concurrent.CopyOnWriteArrayList;
+import java.nio.ByteBuffer;
+import java.util.Collections;
+import java.util.Optional;
+import java.util.Set;
+import java.util.zip.Checksum;
import javax.annotation.Nullable;
import com.google.common.collect.ImmutableMap;
+import com.google.common.jimfs.Jimfs;
-import accord.topology.TopologyUtils;
+import org.apache.cassandra.concurrent.ExecutorFactory;
+import org.apache.cassandra.concurrent.ExecutorPlus;
import org.apache.cassandra.config.AccordSpec;
+import org.apache.cassandra.config.Config;
+import org.apache.cassandra.db.TypeSizes;
+import org.apache.cassandra.distributed.test.log.CMSTestBase;
+import org.apache.cassandra.harry.sut.TokenPlacementModel;
+import org.apache.cassandra.io.filesystem.ListenableFileSystem;
+import org.apache.cassandra.io.util.DataInputPlus;
+import org.apache.cassandra.io.util.DataOutputPlus;
+import org.apache.cassandra.journal.AsyncCallbacks;
+import org.apache.cassandra.journal.Journal;
+import org.apache.cassandra.journal.KeySupport;
+import org.apache.cassandra.journal.ValueSerializer;
import org.apache.cassandra.schema.*;
-import org.junit.Ignore;
+
+import org.junit.Assert;
import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import accord.Utils;
-import accord.api.Data;
-import accord.api.RoutingKey;
-import accord.api.Update;
-import accord.api.Write;
-import accord.local.Node;
-import accord.messages.MessageType;
-import accord.messages.PreAccept;
-import accord.messages.TxnRequest;
-import accord.primitives.FullKeyRoute;
-import accord.primitives.FullRoute;
-import accord.primitives.Keys;
-import accord.primitives.Ranges;
-import accord.primitives.Seekables;
-import accord.primitives.Timestamp;
-import accord.primitives.Txn;
-import accord.primitives.TxnId;
-import accord.topology.Topologies;
-import org.apache.cassandra.concurrent.ExecutorFactory;
-import org.apache.cassandra.concurrent.ExecutorPlus;
+
import org.apache.cassandra.config.DatabaseDescriptor;
import org.apache.cassandra.config.ParameterizedClass;
-import org.apache.cassandra.db.ColumnFamilyStore;
import org.apache.cassandra.db.Keyspace;
-import org.apache.cassandra.db.commitlog.CommitLog;
-import org.apache.cassandra.db.marshal.Int32Type;
import org.apache.cassandra.dht.Murmur3Partitioner;
import org.apache.cassandra.io.util.File;
-import org.apache.cassandra.io.util.Files;
-import org.apache.cassandra.service.accord.AccordJournal;
-import org.apache.cassandra.service.accord.TokenRange;
-import org.apache.cassandra.service.accord.api.AccordRoutingKey;
-import org.apache.cassandra.service.accord.api.PartitionKey;
-import org.apache.cassandra.service.accord.txn.TxnNamedRead;
-import org.apache.cassandra.service.accord.txn.TxnQuery;
-import org.apache.cassandra.service.accord.txn.TxnRead;
-import org.apache.cassandra.utils.ByteBufferUtil;
+import org.apache.cassandra.tcm.AtomicLongBackedProcessor;
+import org.apache.cassandra.tcm.ClusterMetadata;
import org.apache.cassandra.utils.Isolated;
import org.apache.cassandra.utils.concurrent.CountDownLatch;
public class AccordJournalSimulationTest extends SimulationTestBase
{
@Test
- @Ignore // TODO: re-enable
- public void test() throws IOException
+ public void simpleRWTest() throws IOException
{
- simulate(arr(() -> run()),
- () -> check());
+ simulate(arr(() -> {
+ ListenableFileSystem fs = new ListenableFileSystem(Jimfs.newFileSystem());
+ File.unsafeSetFilesystem(fs);
+ DatabaseDescriptor.daemonInitialization();
+ DatabaseDescriptor.setCommitLogCompression(new ParameterizedClass("LZ4Compressor", ImmutableMap.of())); //
+ DatabaseDescriptor.setCommitLogWriteDiskAccessMode(Config.DiskAccessMode.standard);
+ DatabaseDescriptor.initializeCommitLogDiskAccessMode();
+ System.out.println("DatabaseDescriptor.getCommitLogWriteDiskAccessMode() = " + DatabaseDescriptor.getCommitLogWriteDiskAccessMode());
+
+ DatabaseDescriptor.setPartitionerUnsafe(Murmur3Partitioner.instance);
+ long seed = 1L;
+ DatabaseDescriptor.setAccordJournalDirectory("/journal");
+ new File("/journal").createDirectoriesIfNotExists();
+
+ DatabaseDescriptor.setDumpHeapOnUncaughtException(false);
+
+ Keyspace.setInitialized();
+
+ CMSTestBase.CMSSut sut = new CMSTestBase.CMSSut(AtomicLongBackedProcessor::new,
+ false,
+ new FakeSchema(),
+ new TokenPlacementModel.SimpleReplicationFactor(1));
+
+ State.journal = new Journal<>("AccordJournal",
+ new File("/journal"),
+ new AccordSpec.JournalSpec(),
+ new TestCallbacks(),
+ new IdentityKeySerializer(),
+ new IdentityValueSerializer());
+ }),
+ () -> check());
}
- private static void run()
+ public static void check()
{
- for (int i = 0; i < State.events; i++)
+ State.journal.start();
+ try
+ {
+ for (int i = 0; i < 100; i++)
+ {
+ int finalI = i;
+ State.executor.submit(() -> State.journal.asyncWrite("test" + finalI, "test" + finalI, Collections.singleton(1), null));
+ }
+
+ State.latch.await();
+
+ for (int i = 0; i < 100; i++)
+ {
+ System.out.println("Reading " + State.journal.readFirst("test" + i));
+ Assert.assertEquals(State.journal.readFirst("test" + i), "test" + i);
+ }
+ }
+ catch (Throwable e)
{
- int finalI = i;
- State.executor.execute(() -> State.append(finalI));
+ e.printStackTrace();
}
+ finally
+ {
+ State.journal.shutdown();
+ }
+ }
- try
+ public static class TestCallbacks implements AsyncCallbacks<String, String>
+ {
+
+ @Override
+ public void onWrite(long segment, int position, int size, String key, String value, Object writeContext)
{
- State.eventsDurable.await();
- State.logger.info("All events are durable done!");
+ State.latch.decrement();
}
- catch (InterruptedException e)
+
+ @Override
+ public void onWriteFailed(String key, String value, Object writeContext, Throwable cause)
{
- throw new AssertionError(e);
+ State.latch.decrement();
}
- if (!State.exceptions.isEmpty())
+ @Override
+ public void onFlush(long segment, int position)
{
- AssertionError error = new AssertionError("Exceptions found during test");
- State.exceptions.forEach(error::addSuppressed);
- throw error;
}
- State.journal.shutdown();
- State.logger.info("Run complete");
+ @Override
+ public void onFlushFailed(Throwable cause)
+ {
+ new RuntimeException("Could not flush", cause).printStackTrace();
Review Comment:
this is a big issue as the test could pass and this *will* be ignored. You should save this to `State` and assert this in the test. Any failures is unexpected and should lead to a test fault
##########
test/simulator/test/org/apache/cassandra/simulator/test/AccordJournalSimulationTest.java:
##########
@@ -18,250 +18,359 @@
package org.apache.cassandra.simulator.test;
import java.io.IOException;
-import java.util.List;
-import java.util.UUID;
-import java.util.concurrent.CopyOnWriteArrayList;
+import java.nio.ByteBuffer;
+import java.util.Collections;
+import java.util.Optional;
+import java.util.Set;
+import java.util.zip.Checksum;
import javax.annotation.Nullable;
import com.google.common.collect.ImmutableMap;
+import com.google.common.jimfs.Jimfs;
-import accord.topology.TopologyUtils;
+import org.apache.cassandra.concurrent.ExecutorFactory;
+import org.apache.cassandra.concurrent.ExecutorPlus;
import org.apache.cassandra.config.AccordSpec;
+import org.apache.cassandra.config.Config;
+import org.apache.cassandra.db.TypeSizes;
+import org.apache.cassandra.distributed.test.log.CMSTestBase;
+import org.apache.cassandra.harry.sut.TokenPlacementModel;
+import org.apache.cassandra.io.filesystem.ListenableFileSystem;
+import org.apache.cassandra.io.util.DataInputPlus;
+import org.apache.cassandra.io.util.DataOutputPlus;
+import org.apache.cassandra.journal.AsyncCallbacks;
+import org.apache.cassandra.journal.Journal;
+import org.apache.cassandra.journal.KeySupport;
+import org.apache.cassandra.journal.ValueSerializer;
import org.apache.cassandra.schema.*;
-import org.junit.Ignore;
+
+import org.junit.Assert;
import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import accord.Utils;
-import accord.api.Data;
-import accord.api.RoutingKey;
-import accord.api.Update;
-import accord.api.Write;
-import accord.local.Node;
-import accord.messages.MessageType;
-import accord.messages.PreAccept;
-import accord.messages.TxnRequest;
-import accord.primitives.FullKeyRoute;
-import accord.primitives.FullRoute;
-import accord.primitives.Keys;
-import accord.primitives.Ranges;
-import accord.primitives.Seekables;
-import accord.primitives.Timestamp;
-import accord.primitives.Txn;
-import accord.primitives.TxnId;
-import accord.topology.Topologies;
-import org.apache.cassandra.concurrent.ExecutorFactory;
-import org.apache.cassandra.concurrent.ExecutorPlus;
+
import org.apache.cassandra.config.DatabaseDescriptor;
import org.apache.cassandra.config.ParameterizedClass;
-import org.apache.cassandra.db.ColumnFamilyStore;
import org.apache.cassandra.db.Keyspace;
-import org.apache.cassandra.db.commitlog.CommitLog;
-import org.apache.cassandra.db.marshal.Int32Type;
import org.apache.cassandra.dht.Murmur3Partitioner;
import org.apache.cassandra.io.util.File;
-import org.apache.cassandra.io.util.Files;
-import org.apache.cassandra.service.accord.AccordJournal;
-import org.apache.cassandra.service.accord.TokenRange;
-import org.apache.cassandra.service.accord.api.AccordRoutingKey;
-import org.apache.cassandra.service.accord.api.PartitionKey;
-import org.apache.cassandra.service.accord.txn.TxnNamedRead;
-import org.apache.cassandra.service.accord.txn.TxnQuery;
-import org.apache.cassandra.service.accord.txn.TxnRead;
-import org.apache.cassandra.utils.ByteBufferUtil;
+import org.apache.cassandra.tcm.AtomicLongBackedProcessor;
+import org.apache.cassandra.tcm.ClusterMetadata;
import org.apache.cassandra.utils.Isolated;
import org.apache.cassandra.utils.concurrent.CountDownLatch;
public class AccordJournalSimulationTest extends SimulationTestBase
{
@Test
- @Ignore // TODO: re-enable
- public void test() throws IOException
+ public void simpleRWTest() throws IOException
{
- simulate(arr(() -> run()),
- () -> check());
+ simulate(arr(() -> {
+ ListenableFileSystem fs = new ListenableFileSystem(Jimfs.newFileSystem());
+ File.unsafeSetFilesystem(fs);
+ DatabaseDescriptor.daemonInitialization();
+ DatabaseDescriptor.setCommitLogCompression(new ParameterizedClass("LZ4Compressor", ImmutableMap.of())); //
+ DatabaseDescriptor.setCommitLogWriteDiskAccessMode(Config.DiskAccessMode.standard);
+ DatabaseDescriptor.initializeCommitLogDiskAccessMode();
+ System.out.println("DatabaseDescriptor.getCommitLogWriteDiskAccessMode() = " + DatabaseDescriptor.getCommitLogWriteDiskAccessMode());
+
+ DatabaseDescriptor.setPartitionerUnsafe(Murmur3Partitioner.instance);
+ long seed = 1L;
+ DatabaseDescriptor.setAccordJournalDirectory("/journal");
+ new File("/journal").createDirectoriesIfNotExists();
+
+ DatabaseDescriptor.setDumpHeapOnUncaughtException(false);
+
+ Keyspace.setInitialized();
+
+ CMSTestBase.CMSSut sut = new CMSTestBase.CMSSut(AtomicLongBackedProcessor::new,
+ false,
+ new FakeSchema(),
+ new TokenPlacementModel.SimpleReplicationFactor(1));
+
+ State.journal = new Journal<>("AccordJournal",
+ new File("/journal"),
+ new AccordSpec.JournalSpec(),
+ new TestCallbacks(),
+ new IdentityKeySerializer(),
+ new IdentityValueSerializer());
+ }),
+ () -> check());
}
- private static void run()
+ public static void check()
{
- for (int i = 0; i < State.events; i++)
+ State.journal.start();
+ try
+ {
+ for (int i = 0; i < 100; i++)
+ {
+ int finalI = i;
+ State.executor.submit(() -> State.journal.asyncWrite("test" + finalI, "test" + finalI, Collections.singleton(1), null));
+ }
+
+ State.latch.await();
+
+ for (int i = 0; i < 100; i++)
+ {
+ System.out.println("Reading " + State.journal.readFirst("test" + i));
Review Comment:
Logger please
##########
test/simulator/test/org/apache/cassandra/simulator/test/AccordJournalSimulationTest.java:
##########
@@ -18,250 +18,359 @@
package org.apache.cassandra.simulator.test;
import java.io.IOException;
-import java.util.List;
-import java.util.UUID;
-import java.util.concurrent.CopyOnWriteArrayList;
+import java.nio.ByteBuffer;
+import java.util.Collections;
+import java.util.Optional;
+import java.util.Set;
+import java.util.zip.Checksum;
import javax.annotation.Nullable;
import com.google.common.collect.ImmutableMap;
+import com.google.common.jimfs.Jimfs;
-import accord.topology.TopologyUtils;
+import org.apache.cassandra.concurrent.ExecutorFactory;
+import org.apache.cassandra.concurrent.ExecutorPlus;
import org.apache.cassandra.config.AccordSpec;
+import org.apache.cassandra.config.Config;
+import org.apache.cassandra.db.TypeSizes;
+import org.apache.cassandra.distributed.test.log.CMSTestBase;
+import org.apache.cassandra.harry.sut.TokenPlacementModel;
+import org.apache.cassandra.io.filesystem.ListenableFileSystem;
+import org.apache.cassandra.io.util.DataInputPlus;
+import org.apache.cassandra.io.util.DataOutputPlus;
+import org.apache.cassandra.journal.AsyncCallbacks;
+import org.apache.cassandra.journal.Journal;
+import org.apache.cassandra.journal.KeySupport;
+import org.apache.cassandra.journal.ValueSerializer;
import org.apache.cassandra.schema.*;
-import org.junit.Ignore;
+
+import org.junit.Assert;
import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import accord.Utils;
-import accord.api.Data;
-import accord.api.RoutingKey;
-import accord.api.Update;
-import accord.api.Write;
-import accord.local.Node;
-import accord.messages.MessageType;
-import accord.messages.PreAccept;
-import accord.messages.TxnRequest;
-import accord.primitives.FullKeyRoute;
-import accord.primitives.FullRoute;
-import accord.primitives.Keys;
-import accord.primitives.Ranges;
-import accord.primitives.Seekables;
-import accord.primitives.Timestamp;
-import accord.primitives.Txn;
-import accord.primitives.TxnId;
-import accord.topology.Topologies;
-import org.apache.cassandra.concurrent.ExecutorFactory;
-import org.apache.cassandra.concurrent.ExecutorPlus;
+
import org.apache.cassandra.config.DatabaseDescriptor;
import org.apache.cassandra.config.ParameterizedClass;
-import org.apache.cassandra.db.ColumnFamilyStore;
import org.apache.cassandra.db.Keyspace;
-import org.apache.cassandra.db.commitlog.CommitLog;
-import org.apache.cassandra.db.marshal.Int32Type;
import org.apache.cassandra.dht.Murmur3Partitioner;
import org.apache.cassandra.io.util.File;
-import org.apache.cassandra.io.util.Files;
-import org.apache.cassandra.service.accord.AccordJournal;
-import org.apache.cassandra.service.accord.TokenRange;
-import org.apache.cassandra.service.accord.api.AccordRoutingKey;
-import org.apache.cassandra.service.accord.api.PartitionKey;
-import org.apache.cassandra.service.accord.txn.TxnNamedRead;
-import org.apache.cassandra.service.accord.txn.TxnQuery;
-import org.apache.cassandra.service.accord.txn.TxnRead;
-import org.apache.cassandra.utils.ByteBufferUtil;
+import org.apache.cassandra.tcm.AtomicLongBackedProcessor;
+import org.apache.cassandra.tcm.ClusterMetadata;
import org.apache.cassandra.utils.Isolated;
import org.apache.cassandra.utils.concurrent.CountDownLatch;
public class AccordJournalSimulationTest extends SimulationTestBase
{
@Test
- @Ignore // TODO: re-enable
- public void test() throws IOException
+ public void simpleRWTest() throws IOException
{
- simulate(arr(() -> run()),
- () -> check());
+ simulate(arr(() -> {
+ ListenableFileSystem fs = new ListenableFileSystem(Jimfs.newFileSystem());
+ File.unsafeSetFilesystem(fs);
+ DatabaseDescriptor.daemonInitialization();
+ DatabaseDescriptor.setCommitLogCompression(new ParameterizedClass("LZ4Compressor", ImmutableMap.of())); //
+ DatabaseDescriptor.setCommitLogWriteDiskAccessMode(Config.DiskAccessMode.standard);
+ DatabaseDescriptor.initializeCommitLogDiskAccessMode();
+ System.out.println("DatabaseDescriptor.getCommitLogWriteDiskAccessMode() = " + DatabaseDescriptor.getCommitLogWriteDiskAccessMode());
+
+ DatabaseDescriptor.setPartitionerUnsafe(Murmur3Partitioner.instance);
+ long seed = 1L;
+ DatabaseDescriptor.setAccordJournalDirectory("/journal");
+ new File("/journal").createDirectoriesIfNotExists();
+
+ DatabaseDescriptor.setDumpHeapOnUncaughtException(false);
+
+ Keyspace.setInitialized();
+
+ CMSTestBase.CMSSut sut = new CMSTestBase.CMSSut(AtomicLongBackedProcessor::new,
+ false,
+ new FakeSchema(),
+ new TokenPlacementModel.SimpleReplicationFactor(1));
+
+ State.journal = new Journal<>("AccordJournal",
+ new File("/journal"),
+ new AccordSpec.JournalSpec(),
+ new TestCallbacks(),
+ new IdentityKeySerializer(),
+ new IdentityValueSerializer());
+ }),
+ () -> check());
}
- private static void run()
+ public static void check()
{
- for (int i = 0; i < State.events; i++)
+ State.journal.start();
+ try
+ {
+ for (int i = 0; i < 100; i++)
+ {
+ int finalI = i;
+ State.executor.submit(() -> State.journal.asyncWrite("test" + finalI, "test" + finalI, Collections.singleton(1), null));
+ }
+
+ State.latch.await();
+
+ for (int i = 0; i < 100; i++)
+ {
+ System.out.println("Reading " + State.journal.readFirst("test" + i));
+ Assert.assertEquals(State.journal.readFirst("test" + i), "test" + i);
+ }
+ }
+ catch (Throwable e)
{
- int finalI = i;
- State.executor.execute(() -> State.append(finalI));
+ e.printStackTrace();
}
+ finally
+ {
+ State.journal.shutdown();
+ }
+ }
- try
+ public static class TestCallbacks implements AsyncCallbacks<String, String>
+ {
+
+ @Override
+ public void onWrite(long segment, int position, int size, String key, String value, Object writeContext)
{
- State.eventsDurable.await();
- State.logger.info("All events are durable done!");
+ State.latch.decrement();
}
- catch (InterruptedException e)
+
+ @Override
+ public void onWriteFailed(String key, String value, Object writeContext, Throwable cause)
{
- throw new AssertionError(e);
+ State.latch.decrement();
}
- if (!State.exceptions.isEmpty())
+ @Override
+ public void onFlush(long segment, int position)
{
- AssertionError error = new AssertionError("Exceptions found during test");
- State.exceptions.forEach(error::addSuppressed);
- throw error;
}
- State.journal.shutdown();
- State.logger.info("Run complete");
+ @Override
+ public void onFlushFailed(Throwable cause)
+ {
+ new RuntimeException("Could not flush", cause).printStackTrace();
+ }
}
- private static void check()
+ @Isolated
+ public static class IdentityValueSerializer implements ValueSerializer<String, String>
{
- State.logger.info("Check starting");
- State.journal.start(null); // to avoid a while true deadlock
- try
+
+ @Override
+ public int serializedSize(String key, String value, int userVersion)
{
- for (int i = 0; i < State.events; i++)
- {
- TxnRequest<?> event = State.journal.readMessage(State.toTxnId(i), MessageType.PRE_ACCEPT_REQ, PreAccept.class);
- State.logger.info("Event {} -> {}", i, event);
- if (event == null)
- throw new AssertionError(String.format("Unable to read event %d", i));
- }
- State.logger.info("Check complete");
+ return TypeSizes.INT_SIZE + key.length();
}
- finally
+
+ @Override
+ public void serialize(String key, String value, DataOutputPlus out, int userVersion) throws IOException
{
- State.journal.shutdown();
+ out.writeInt(key.length());
+ out.writeBytes(key);
+ }
+
+ @Override
+ public String deserialize(String key, DataInputPlus in, int userVersion) throws IOException
+ {
+ int size = in.readInt();
+ byte[] value = new byte[size];
+ for (int i = 0; i < size; i++)
+ value[i] = in.readByte();
+
+ return new String(value);
+ }
+ }
+
+ @Isolated
+ public static class IdentityKeySerializer implements KeySupport<String>
+ {
+
+ @Override
+ public int serializedSize(int userVersion)
+ {
+ return 16;
+ }
+
+ @Override
+ public void serialize(String key, DataOutputPlus out, int userVersion) throws IOException
+ {
+ int maxSize = 16 - TypeSizes.INT_SIZE;
+ if (key.length() > maxSize)
+ throw new IllegalStateException();
+
+ out.writeInt(key.length());
+ out.writeBytes(key);
+ int remaining = maxSize - key.length();
+ for (int i = 0; i < remaining; i++)
+ out.writeByte(0);
+ }
+
+ @Override
+ public String deserialize(DataInputPlus in, int userVersion) throws IOException
+ {
+ int size = in.readInt();
+ byte[] key = new byte[size];
+ for (int i = 0; i < size; i++)
+ key[i] = in.readByte();
+
+ int maxSize = 16 - TypeSizes.INT_SIZE;
+ int remaining = maxSize - size;
+ for (int i = 0; i < remaining; i++)
+ in.readByte(); // todo assert 0
+
+ return new String(key);
+ }
+
+ @Override
+ public String deserialize(ByteBuffer buffer, int position, int userVersion)
+ {
+ int size = buffer.getInt();
+ byte[] key = new byte[size];
+ for (int i = 0; i < size; i++)
+ key[i] = buffer.get();
+
+ int maxSize = 16 - TypeSizes.INT_SIZE;
+ int remaining = maxSize - size;
+ for (int i = 0; i < remaining; i++)
+ buffer.get(); // todo assert 0
Review Comment:
want to fix the todo? Also `0` is common so could be good to use another value like `4` (randomly selected from XKCD)
##########
test/simulator/test/org/apache/cassandra/simulator/test/AccordJournalSimulationTest.java:
##########
@@ -18,250 +18,359 @@
package org.apache.cassandra.simulator.test;
import java.io.IOException;
-import java.util.List;
-import java.util.UUID;
-import java.util.concurrent.CopyOnWriteArrayList;
+import java.nio.ByteBuffer;
+import java.util.Collections;
+import java.util.Optional;
+import java.util.Set;
+import java.util.zip.Checksum;
import javax.annotation.Nullable;
import com.google.common.collect.ImmutableMap;
+import com.google.common.jimfs.Jimfs;
-import accord.topology.TopologyUtils;
+import org.apache.cassandra.concurrent.ExecutorFactory;
+import org.apache.cassandra.concurrent.ExecutorPlus;
import org.apache.cassandra.config.AccordSpec;
+import org.apache.cassandra.config.Config;
+import org.apache.cassandra.db.TypeSizes;
+import org.apache.cassandra.distributed.test.log.CMSTestBase;
+import org.apache.cassandra.harry.sut.TokenPlacementModel;
+import org.apache.cassandra.io.filesystem.ListenableFileSystem;
+import org.apache.cassandra.io.util.DataInputPlus;
+import org.apache.cassandra.io.util.DataOutputPlus;
+import org.apache.cassandra.journal.AsyncCallbacks;
+import org.apache.cassandra.journal.Journal;
+import org.apache.cassandra.journal.KeySupport;
+import org.apache.cassandra.journal.ValueSerializer;
import org.apache.cassandra.schema.*;
-import org.junit.Ignore;
+
+import org.junit.Assert;
import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import accord.Utils;
-import accord.api.Data;
-import accord.api.RoutingKey;
-import accord.api.Update;
-import accord.api.Write;
-import accord.local.Node;
-import accord.messages.MessageType;
-import accord.messages.PreAccept;
-import accord.messages.TxnRequest;
-import accord.primitives.FullKeyRoute;
-import accord.primitives.FullRoute;
-import accord.primitives.Keys;
-import accord.primitives.Ranges;
-import accord.primitives.Seekables;
-import accord.primitives.Timestamp;
-import accord.primitives.Txn;
-import accord.primitives.TxnId;
-import accord.topology.Topologies;
-import org.apache.cassandra.concurrent.ExecutorFactory;
-import org.apache.cassandra.concurrent.ExecutorPlus;
+
import org.apache.cassandra.config.DatabaseDescriptor;
import org.apache.cassandra.config.ParameterizedClass;
-import org.apache.cassandra.db.ColumnFamilyStore;
import org.apache.cassandra.db.Keyspace;
-import org.apache.cassandra.db.commitlog.CommitLog;
-import org.apache.cassandra.db.marshal.Int32Type;
import org.apache.cassandra.dht.Murmur3Partitioner;
import org.apache.cassandra.io.util.File;
-import org.apache.cassandra.io.util.Files;
-import org.apache.cassandra.service.accord.AccordJournal;
-import org.apache.cassandra.service.accord.TokenRange;
-import org.apache.cassandra.service.accord.api.AccordRoutingKey;
-import org.apache.cassandra.service.accord.api.PartitionKey;
-import org.apache.cassandra.service.accord.txn.TxnNamedRead;
-import org.apache.cassandra.service.accord.txn.TxnQuery;
-import org.apache.cassandra.service.accord.txn.TxnRead;
-import org.apache.cassandra.utils.ByteBufferUtil;
+import org.apache.cassandra.tcm.AtomicLongBackedProcessor;
+import org.apache.cassandra.tcm.ClusterMetadata;
import org.apache.cassandra.utils.Isolated;
import org.apache.cassandra.utils.concurrent.CountDownLatch;
public class AccordJournalSimulationTest extends SimulationTestBase
{
@Test
- @Ignore // TODO: re-enable
- public void test() throws IOException
+ public void simpleRWTest() throws IOException
{
- simulate(arr(() -> run()),
- () -> check());
+ simulate(arr(() -> {
+ ListenableFileSystem fs = new ListenableFileSystem(Jimfs.newFileSystem());
+ File.unsafeSetFilesystem(fs);
+ DatabaseDescriptor.daemonInitialization();
+ DatabaseDescriptor.setCommitLogCompression(new ParameterizedClass("LZ4Compressor", ImmutableMap.of())); //
+ DatabaseDescriptor.setCommitLogWriteDiskAccessMode(Config.DiskAccessMode.standard);
+ DatabaseDescriptor.initializeCommitLogDiskAccessMode();
+ System.out.println("DatabaseDescriptor.getCommitLogWriteDiskAccessMode() = " + DatabaseDescriptor.getCommitLogWriteDiskAccessMode());
+
+ DatabaseDescriptor.setPartitionerUnsafe(Murmur3Partitioner.instance);
+ long seed = 1L;
+ DatabaseDescriptor.setAccordJournalDirectory("/journal");
+ new File("/journal").createDirectoriesIfNotExists();
+
+ DatabaseDescriptor.setDumpHeapOnUncaughtException(false);
+
+ Keyspace.setInitialized();
+
+ CMSTestBase.CMSSut sut = new CMSTestBase.CMSSut(AtomicLongBackedProcessor::new,
+ false,
+ new FakeSchema(),
+ new TokenPlacementModel.SimpleReplicationFactor(1));
+
+ State.journal = new Journal<>("AccordJournal",
+ new File("/journal"),
+ new AccordSpec.JournalSpec(),
+ new TestCallbacks(),
+ new IdentityKeySerializer(),
+ new IdentityValueSerializer());
+ }),
+ () -> check());
}
- private static void run()
+ public static void check()
{
- for (int i = 0; i < State.events; i++)
+ State.journal.start();
+ try
+ {
+ for (int i = 0; i < 100; i++)
+ {
+ int finalI = i;
+ State.executor.submit(() -> State.journal.asyncWrite("test" + finalI, "test" + finalI, Collections.singleton(1), null));
+ }
+
+ State.latch.await();
+
+ for (int i = 0; i < 100; i++)
+ {
+ System.out.println("Reading " + State.journal.readFirst("test" + i));
+ Assert.assertEquals(State.journal.readFirst("test" + i), "test" + i);
+ }
+ }
+ catch (Throwable e)
{
- int finalI = i;
- State.executor.execute(() -> State.append(finalI));
+ e.printStackTrace();
Review Comment:
write to logger please
--
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.
To unsubscribe, e-mail: pr-unsubscribe@cassandra.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: pr-unsubscribe@cassandra.apache.org
For additional commands, e-mail: pr-help@cassandra.apache.org
Re: [PR] Bring back Journal simulator (w/o Accord at least for now); add semap… [cassandra]
Posted by "ifesdjeen (via GitHub)" <gi...@apache.org>.
ifesdjeen commented on code in PR #3408:
URL: https://github.com/apache/cassandra/pull/3408#discussion_r1676812352
##########
test/simulator/test/org/apache/cassandra/simulator/test/TrivialSimulationTest.java:
##########
@@ -85,9 +97,97 @@ public void componentTest()
}
@Test
- public void identityHashMapTest()
+ public void semaphoreTest()
{
- simulate(arr(() -> new IdentityHashMap<>().put(1, 1)),
- () -> {});
+ long seed = System.currentTimeMillis();
+ semaphoreTestInternal(seed);
+ State.record = false;
+ // Verify that subsequent interleavings will be the same
+ semaphoreTestInternal(seed);
+ }
+
+ protected void semaphoreTestInternal(long seed)
+ {
+ simulate(arr(() -> {
+ ExecutorPlus executor = ExecutorFactory.Global.executorFactory().pooled("semaphore-test-", 10);
+ Semaphore semaphore = Semaphore.newSemaphore(5);
+ CountDownLatch latch = CountDownLatch.newCountDownLatch(5);
+
+ for (int i = 0; i < 5; i++)
+ {
+ int thread = i;
+ executor.submit(() -> {
+ for (int j = 0; j < 100; j++)
+ {
+ int permits = semaphore.permits();
+ Assert.assertTrue(permits + " should be non negative", permits >= 0);
+
+ try
+ {
+ semaphore.acquire(1);
+ State.tick(thread, j);
+ semaphore.release(1);
+ }
+ catch (Throwable e)
+ {
+ throw new RuntimeException(e);
+ }
+ }
+ latch.decrement();
+ });
+ }
+
+ latch.awaitUninterruptibly();
+ int permits = semaphore.permits();
+ Assert.assertEquals(5, permits);
+ }),
+ () -> {},
+ seed);
+ }
+
+ @Shared
+ public static class State
+ {
+ static final List<Tick> ticks = new ArrayList<>();
+ static boolean record = true;
+ static int i = 0;
+
+ public static void tick(int thread, int iteration)
Review Comment:
It does not have to be thread safe. It is executed in a single thread.
--
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.
To unsubscribe, e-mail: pr-unsubscribe@cassandra.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: pr-unsubscribe@cassandra.apache.org
For additional commands, e-mail: pr-help@cassandra.apache.org