Merge branch 'main' into remove_oehostverify_dependency_from_nonsgx_builds

Author: achamayou

doc/architecture/threading.rst

@@ -17,8 +17,6 @@ Implementation
 Configuration
 ~~~~~~~~~~~~~
 
-.. warning:: Multiple enclave threads are experimental for now. The ``worker_threads`` configuration option should be set to ``0`` in production environments.
-
 To enable multiple worker threads, the ``worker_threads`` configuration option can be used  along with the number of desired threads to ``cchost`` when starting a CCF node.
 
 It is strongly recommended that all CCF nodes run the same number of worker threads.
@@ -32,4 +30,4 @@ It is strongly advised that during the execution of a command the application do
 Any inter-command communication must be performed via the key-value store, to ensure that CCF can rollback commands or change the primary as required.
 
 If an application has global state that exists outside the key-value store, CCF offers several concurrency control primitives (via Open Enclave) to protect memory that could be accessed concurrently by multiple threads.
-It is recommended that these primitives are used rather than other primitives, such as mutexes, which may result in an OCALL.
+It is recommended that these primitives are used rather than other primitives, such as mutexes, which may result in an OCALL.

tests/e2e_logging.py

@@ -973,10 +973,20 @@ def id_for(i):
         assert r.status_code == http.HTTPStatus.BAD_REQUEST
         assert r.body.json()["error"]["code"] == "InvalidInput"
 
-        # - Try the first invalid seqno
-        r = c.get(
-            f"/app/log/public/historical/range?to_seqno={last_valid_seqno+1}&id={id_a}"
-        )
+        # - Try the first invalid seqno.
+        # !! If implicit TX occurs during this time, fetch last TX id and retry.
+        attemtps = 5
+        for _ in range(0, attemtps):
+            r = c.get(
+                f"/app/log/public/historical/range?to_seqno={last_valid_seqno+1}&id={id_a}"
+            )
+            if r.status_code == http.HTTPStatus.BAD_REQUEST:
+                break
+
+            r = c.get("/node/commit")
+            assert r.status_code == http.HTTPStatus.OK
+            last_valid_seqno = TxID.from_str(r.body.json()["transaction_id"]).seqno
+
         assert r.status_code == http.HTTPStatus.BAD_REQUEST
         assert r.body.json()["error"]["code"] == "InvalidInput"