Merge #1905 #1915

1905: build(nix): set clang path env var r=tiagolobocastro a=urso

Sets CLANG_PATH environment variable in shell.nix to use Nix-provided clang compiler, preventing Rust tooling from falling back to potentially incompatible host system clang compiler.

When clang is installed cargo might fallback to /usr/bin/clang instead of using the one setup by the shell.nix environment. Unfortunately, if the clang versions are incompatible, this might lead to errors when linking DPDK/SPDK crypto support with the io-engine. Explicitely setting CLANG_PATH ensure that the correct clang instance will be used.

Note: I also did run into this problem even though PATH was set correctly and `which clang` did give me the correct path.

1915: Don't let 1 bad nexus lockup the entire nexus subsystem r=tiagolobocastro a=tiagolobocastro

    refactor(grpc/nexus): don't take subsystem lock on create/destroy
    
    A nexus gets sometimes locked up during unshare, and we're not yet sure of
    how this happens (ie IO stuck)
    This change loosens the sequential creation and destruction of nexuses,
    allowing us to interact with other nexuses when another is locked up.
    
    We could also enforce sequential during the happy path, for the subsystem
    itself?
    
    We should also start reporting the stuck nexuses in some way?
    
---

    chore: update commitlint config file
    
    This should have been modified since I lasted updated the packages, but
    somehow I must have missed this!


Co-authored-by: Steffen Siering <[email protected]>
Co-authored-by: Tiago Castro <[email protected]>

Author: 3 people

commitlint.config.js

@@ -1,26 +1,38 @@
-module.exports = {
-  extends: ['@commitlint/config-conventional'],
-  rules: {
-    'type-enum': [2, 'always', ['build', 'chore', 'ci', 'docs', 'feat', 'fix', 'perf', 'refactor', 'revert', 'style', 'test', 'example', 'security']],
-    'code-review-rule': [0, 'always'],
-  },
-  defaultIgnores: false,
-  ignores: [
-      (message) => message.startsWith('chore(bors): merge pull request #'),
-      (message) => message.startsWith('Merge #')
-  ],
-  plugins: [
-    {
-      rules: {
-        'code-review-rule': ({subject}) => {
-          const REVIEW_COMMENTS = `Please don't merge code-review commits, instead squash them in the parent commit`;
-          if (subject.includes('code-review')) return [ false, REVIEW_COMMENTS ];
-          if (subject.includes('review comment')) return [ false, REVIEW_COMMENTS ];
-          if (subject.includes('address comment')) return [ false, REVIEW_COMMENTS ];
-          if (subject.includes('addressed comment')) return [ false, REVIEW_COMMENTS ];
-          return [ true ];
-        },
-      },
+export default {
+    rules: {
+        'type-enum': [2, 'always', ['build', 'chore', 'ci', 'docs', 'feat', 'fix', 'perf', 'refactor', 'revert', 'style', 'test', 'example', 'security']],
+        'code-review-rule': [2, 'always'],
+        "body-max-line-length": [2, "always", 100],
+        "footer-leading-blank": [1, "always"],
+        "footer-max-line-length": [1, "always", 100],
+        "header-max-length": [1, "always", 100],
+        "header-trim": [1, "always"],
+        "subject-case": [1, "never", ["sentence-case", "start-case", "pascal-case", "upper-case"]],
+        'subject-empty': [2, 'never'],
+        'subject-full-stop': [2, 'never', '.'],
+        'subject-max-length': [2, 'always', 80],
+        'subject-min-length': [2, 'always', 5],
+        'scope-case': [2, 'always', 'lower-case'],
+        'body-leading-blank': [2, 'always'],
     },
-  ],
+    defaultIgnores: false,
+    ignores: [
+        (message) => message.startsWith('chore(bors): merge pull request #'),
+        (message) => message.startsWith('Merge pull request #'),
+        (message) => message.startsWith('Merge #')
+    ],
+    plugins: [
+        {
+            rules: {
+                'code-review-rule': ({subject}) => {
+                    const REVIEW_COMMENTS = `Please don't merge code-review commits, instead squash them in the parent commit`;
+                    if (subject.includes('code-review')) return [false, REVIEW_COMMENTS];
+                    if (subject.includes('review comment')) return [false, REVIEW_COMMENTS];
+                    if (subject.includes('address comment')) return [false, REVIEW_COMMENTS];
+                    if (subject.includes('addressed comment')) return [false, REVIEW_COMMENTS];
+                    return [true];
+                },
+            },
+        },
+    ],
 }

io-engine/src/grpc/v1/nexus.rs

@@ -75,7 +75,8 @@ impl NexusService {
                     Some(g) => Some(g),
                     None => {
                         return Err(Status::deadline_exceeded(
-                            "Failed to acquire access to object within given timeout".to_string(),
+                            "Failed to acquire access to subsystem within given timeout"
+                                .to_string(),
                         ))
                     }
                 }
@@ -373,7 +374,7 @@ impl NexusRpc for NexusService {
         let ctx = GrpcClientContext::new(&request, function_name!());
         let args = request.into_inner();
 
-        self.serialized(ctx, args.uuid.clone(), true, async move {
+        self.serialized(ctx, args.uuid.clone(), false, async move {
             trace!("{:?}", args);
             let resv_type = NvmeReservationConv(args.resv_type).try_into()?;
             let preempt_policy = NvmePreemptionConv(args.preempt_policy).try_into()?;
@@ -436,7 +437,7 @@ impl NexusRpc for NexusService {
         let ctx = GrpcClientContext::new(&request, function_name!());
         let args = request.into_inner();
 
-        self.serialized(ctx, args.uuid.clone(), true, async move {
+        self.serialized(ctx, args.uuid.clone(), false, async move {
             let rx = rpc_submit::<_, _, nexus::Error>(async move {
                 trace!("{:?}", args);
                 nexus_destroy(&args.uuid).await?;

shell.nix

@@ -62,6 +62,9 @@ let
         export PATH="$PATH:$(pwd)/scripts/nix-sudo"
 
         export IO_ENGINE_DIR="$RUST_TARGET_DEBUG"
+
+        # Prevent Rust tooling to fallback to potentially incompatible host clang compiler
+        export CLANG_PATH="$NIX_CC_FOR_TARGET/bin/clang"
       '';
 
       shellInfoHook = ''

test/python/pytest.ini

@@ -2,3 +2,4 @@
 log_cli = true
 log_level = warn
 console_output_style = classic
+asyncio_default_fixture_loop_scope = function

test/python/requirements.txt

@@ -11,3 +11,4 @@ retrying==1.4.1
 requests==2.32.4
 docker==7.1.0
 pyyaml==6.0.2
+typing-extensions==4.13.2