chore(release): Merge branch 'hotfix-v1.0.1'

Creates patch release v1.0.1
vharsh · Feb 22, 2022 · 78c3971 · 78c3971
2 parents d8d35a6 + 7225aac
commit 78c3971
Show file tree

Hide file tree

Showing 21 changed files with 293 additions and 147 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/chart/templates/_helpers.tpl b/chart/templates/_helpers.tpl
@@ -13,6 +13,6 @@
 {{- if gt $i 0 }}
 {{- printf "," }}
 {{- end }}
-{{- printf "%d" $i }}
+{{- printf "%d" (add $i 1) }}
 {{- end }}
 {{- end }}
diff --git a/chart/templates/mayastor-daemonset.yaml b/chart/templates/mayastor-daemonset.yaml
@@ -36,6 +36,8 @@ spec:
         env:
         - name: RUST_LOG
           value: info,mayastor={{ .Values.mayastorLogLevel }}
+        - name: NVMF_TCP_MAX_QUEUE_DEPTH
+          value: "32"
         - name: MY_NODE_NAME
           valueFrom:
             fieldRef:
@@ -53,7 +55,6 @@ spec:
         - "-g$(MY_POD_IP)"
         - "-nnats"
         - "-y/var/local/mayastor/config.yaml"
-        - "-P/var/local/mayastor/pools.yaml"
         - "-l{{ include "mayastorCpuSpec" . }}"
         - "-pmayastor-etcd"
         command:
@@ -75,12 +76,12 @@ spec:
           # pressure unless they exceed those limits. limits and requests must be the same.
           limits:
             cpu: "{{ .Values.mayastorCpuCount }}"
-            memory: "512Mi"
-            hugepages-2Mi: "{{ .Values.mayastorHugePagesGiB }}Gi"
+            memory: "1Gi"
+            hugepages-2Mi: "{{ max .Values.mayastorHugePagesGiB 2 }}Gi"
           requests:
             cpu: "{{ .Values.mayastorCpuCount }}"
-            memory: "512Mi"
-            hugepages-2Mi: "{{ .Values.mayastorHugePagesGiB }}Gi"
+            memory: "1Gi"
+            hugepages-2Mi: "{{ max .Values.mayastorHugePagesGiB 2 }}Gi"
         ports:
         - containerPort: 10124
           protocol: TCP

diff --git a/composer/Cargo.toml b/composer/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "composer"
-version = "0.1.0"
+version = "1.0.0"
 authors = ["Tiago Castro <[email protected]>"]
 edition = "2018"
 

diff --git a/csi/Cargo.toml b/csi/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 authors = ["Jan Kryl <[email protected]>", "Jeffry Molanus <[email protected]"]
 name = "csi"
-version = "0.2.0"
+version = "1.0.0"
 edition = "2018"
 
 [[bin]]
@@ -21,7 +21,7 @@ failure = "0.1.8"
 futures = { version = "0.3.16", default-features = false }
 glob = "0.3.0"
 lazy_static = "1.4.0"
-nvmeadm = { path = "../nvmeadm", version = "0.1.0" }
+nvmeadm = { path = "../nvmeadm" }
 proc-mounts = "0.2.4"
 prost = "0.8.0"
 prost-derive = "0.8.0"
@@ -30,7 +30,7 @@ regex = "1.5.4"
 serde_json = "1.0.66"
 snafu = "0.6.10"
 sys-mount = "1.3.0"
-sysfs = { path = "../sysfs", version = "0.1.0" }
+sysfs = { path = "../sysfs" }
 tokio = { version = "1.10.0", features = ["full"] }
 tokio-stream = { version = "0.1.7", features = ["net"] }
 tonic = "0.5.2"

diff --git a/deploy/csi-daemonset.yaml b/deploy/csi-daemonset.yaml
@@ -30,7 +30,7 @@ spec:
       # the same.
       containers:
       - name: mayastor-csi
-        image: mayadata/mayastor:v1.0.0
+        image: mayadata/mayastor:v1.0.1
         imagePullPolicy: IfNotPresent
         # we need privileged because we mount filesystems and use mknod
         securityContext:

diff --git a/deploy/mayastor-daemonset.yaml b/deploy/mayastor-daemonset.yaml
@@ -33,11 +33,13 @@ spec:
         command: ['sh', '-c', 'until nc -vz nats 4222; do echo "Waiting for message bus..."; sleep 1; done;']
       containers:
       - name: mayastor
-        image: mayadata/mayastor:v1.0.0
+        image: mayadata/mayastor:v1.0.1
         imagePullPolicy: IfNotPresent
         env:
         - name: RUST_LOG
           value: info,mayastor=info
+        - name: NVMF_TCP_MAX_QUEUE_DEPTH
+          value: "32"
         - name: MY_NODE_NAME
           valueFrom:
             fieldRef:
@@ -50,11 +52,11 @@ spec:
         # The -l argument accepts cpu-list. Indexing starts at zero.
         # For example -l 1,2,10-20 means use core 1, 2, 10 to 20.
         # Note: Ensure that the CPU resources are updated accordingly.
-        # If you use 2 CPUs, the CPU: field should also read 2.
+        #       If you use 2 CPUs, the CPU: field should also read 2.
         - "-N$(MY_NODE_NAME)"
         - "-g$(MY_POD_IP)"
         - "-nnats"
-        - "-P/var/local/mayastor/pools.yaml"
+        - "-y/var/local/mayastor/config.yaml"
         - "-l1"
         - "-pmayastor-etcd"
         command:
@@ -74,7 +76,6 @@ spec:
           # NOTE: Each container must have mem/cpu limits defined in order to
           # belong to Guaranteed QoS class, hence can never get evicted in case of
           # pressure unless they exceed those limits. limits and requests must be the same.
-          #
           limits:
             cpu: "1"
             memory: "1Gi"

diff --git a/devinfo/Cargo.toml b/devinfo/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "devinfo"
-version = "0.1.0"
+version = "1.0.0"
 authors = ["Jeffry Molanus <[email protected]>"]
 edition = "2018"
 

diff --git a/jsonrpc/Cargo.toml b/jsonrpc/Cargo.toml
@@ -2,7 +2,7 @@
 authors = ["Jeffry Molanus <[email protected]>"]
 edition = "2018"
 name = "jsonrpc"
-version = "0.1.0"
+version = "1.0.0"
 
 [dependencies]
 nix = "0.22.1"

diff --git a/mayastor/Cargo.toml b/mayastor/Cargo.toml
@@ -2,7 +2,7 @@
 authors = ["Jeffry Molanus <[email protected]>"]
 edition = "2018"
 name = "mayastor"
-version = "0.9.0"
+version = "1.0.0"
 default-run = "mayastor-client"
 
 [[bin]]
@@ -113,5 +113,5 @@ version = "0.8.2"
 [dev-dependencies]
 assert_matches = "1.5.0"
 composer = { path = "../composer" }
-nvmeadm = {path = "../nvmeadm", version = "0.1.0"}
+nvmeadm = { path = "../nvmeadm" }
 run_script = "0.8.0"
diff --git a/mayastor/src/bdev/nexus/mod.rs b/mayastor/src/bdev/nexus/mod.rs
@@ -28,6 +28,7 @@ mod nexus_channel;
 pub(crate) mod nexus_child;
 pub mod nexus_fn_table;
 pub mod nexus_io;
+pub mod nexus_io_subsystem;
 pub mod nexus_label;
 pub mod nexus_metadata;
 pub mod nexus_module;