chore(bors): merge pull request #667

667: Cherry pick #666 #664 #665 r=tiagolobocastro a=Abhinandan-Purkait Co-authored-by: Abhinandan Purkait <[email protected]> Co-authored-by: Tiago Castro <[email protected]>
openebs · Aug 24, 2023 · 7291b84 · 7291b84
2 parents 872616c + b765869
commit 7291b84
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 25 deletions.
diff --git a/control-plane/agents/src/bin/core/controller/io_engine/v1/replica.rs b/control-plane/agents/src/bin/core/controller/io_engine/v1/replica.rs
@@ -2,7 +2,7 @@ use super::translation::{rpc_replica_to_agent, AgentToIoEngine};
 use crate::controller::io_engine::translation::TryIoEngineToAgent;
 use agents::errors::{GrpcRequest as GrpcRequestError, SvcError};
 use rpc::v1::{
-    replica::{ListReplicaOptions, ReplicaType},
+    replica::{list_replica_options, ListReplicaOptions},
     snapshot::{destroy_snapshot_request, DestroySnapshotRequest},
 };
 use stor_port::{
@@ -19,14 +19,19 @@ use snafu::ResultExt;
 #[async_trait::async_trait]
 impl crate::controller::io_engine::ReplicaListApi for super::RpcClient {
     async fn list_replicas(&self) -> Result<Vec<Replica>, SvcError> {
+        let replicas_except_snapshots_query = list_replica_options::Query {
+            replica: true,
+            snapshot: false,
+            clone: true,
+        };
         let rpc_replicas = self
             .replica()
             .list_replicas(ListReplicaOptions {
                 name: None,
                 poolname: None,
                 uuid: None,
                 pooluuid: None,
-                replicatype: ReplicaType::AllReplicasExceptSnapshots as i32,
+                query: Some(replicas_except_snapshots_query),
             })
             .await
             .context(GrpcRequestError {
@@ -58,7 +63,7 @@ impl crate::controller::io_engine::ReplicaListApi for super::RpcClient {
                 poolname: None,
                 uuid: Some(replica_id.to_string()),
                 pooluuid: None,
-                replicatype: ReplicaType::AllReplicas as i32,
+                query: None,
             })
             .await
             .context(GrpcRequestError {

diff --git a/control-plane/agents/src/bin/core/controller/io_engine/v1/translation.rs b/control-plane/agents/src/bin/core/controller/io_engine/v1/translation.rs
@@ -574,11 +574,17 @@ impl AgentToIoEngine for transport::ListReplicaSnapshots {
             transport::ListReplicaSnapshots::ReplicaSnapshots(id) => (Some(id), None),
             transport::ListReplicaSnapshots::Snapshot(id) => (None, Some(id)),
         };
+
+        // All snapshots except the discarded ones.
+        let non_discarded_snaps = v1::snapshot::list_snapshots_request::Query {
+            invalid: None,
+            discarded: Some(false),
+        };
+
         v1::snapshot::ListSnapshotsRequest {
             source_uuid: source.map(ToString::to_string),
             snapshot_uuid: snapshot.map(ToString::to_string),
-            snapshot_query_type:
-                v1::snapshot::SnapshotQueryType::AllSnapshotsExceptDiscardedSnapshots as i32,
+            query: Some(non_discarded_snaps),
         }
     }
 }

diff --git a/deployer/src/infra/io_engine.rs b/deployer/src/infra/io_engine.rs
@@ -42,6 +42,7 @@ impl ComponentAction for IoEngine {
             .with_env("MAYASTOR_NVMF_HOSTID", Uuid::new_v4().to_string().as_str())
             .with_env("NEXUS_NVMF_RESV_ENABLE", "1")
             .with_env("NEXUS_NVMF_ANA_ENABLE", "1")
+            .with_env("NVMF_TGT_CRDT", "0")
             .with_bind("/tmp", "/host/tmp")
             .with_bind("/var/run/dpdk", "/var/run/dpdk");
 

diff --git a/rpc/api b/rpc/api
diff --git a/rpc/src/lib.rs b/rpc/src/lib.rs
@@ -18,7 +18,6 @@ pub mod io_engine {
 
     use crate::v1::pb::{
         CreateReplicaSnapshotResponse, ListSnapshotsResponse, NexusCreateSnapshotResponse,
-        SnapshotQueryType,
     };
     /// AutoGenerated Io Engine Client V0.
     pub use mayastor_client::MayastorClient as IoEngineClientV0;
@@ -386,7 +385,7 @@ pub mod io_engine {
                 .list_snapshot(super::v1::pb::ListSnapshotsRequest {
                     source_uuid: source_uuid.map(|uuid| uuid.to_string()),
                     snapshot_uuid: snapshot_uuid.map(|uuid| uuid.to_string()),
-                    snapshot_query_type: SnapshotQueryType::AllSnapshots as i32,
+                    query: None,
                 })
                 .await?
                 .into_inner())
@@ -615,9 +614,9 @@ pub mod v1 {
     /// V1 Replica autogenerated grpc code.
     pub mod replica {
         pub use super::pb::{
-            destroy_replica_request, replica_rpc_client, CreateReplicaRequest,
-            DestroyReplicaRequest, ListReplicaOptions, ListReplicasResponse, Replica,
-            ReplicaSpaceUsage, ReplicaType, ShareReplicaRequest, UnshareReplicaRequest,
+            destroy_replica_request, list_replica_options, replica_rpc_client,
+            CreateReplicaRequest, DestroyReplicaRequest, ListReplicaOptions, ListReplicasResponse,
+            Replica, ReplicaSpaceUsage, ShareReplicaRequest, UnshareReplicaRequest,
         };
     }
 
@@ -638,12 +637,12 @@ pub mod v1 {
 
     pub mod snapshot {
         pub use super::pb::{
-            destroy_snapshot_request, snapshot_rpc_client, CreateReplicaSnapshotRequest,
-            CreateReplicaSnapshotResponse, CreateSnapshotCloneRequest, DestroySnapshotRequest,
-            ListSnapshotCloneRequest, ListSnapshotCloneResponse, ListSnapshotsRequest,
-            ListSnapshotsResponse, Nexus, NexusCreateSnapshotReplicaDescriptor,
-            NexusCreateSnapshotReplicaStatus, NexusCreateSnapshotRequest,
-            NexusCreateSnapshotResponse, SnapshotInfo, SnapshotQueryType,
+            destroy_snapshot_request, list_snapshots_request, snapshot_rpc_client,
+            CreateReplicaSnapshotRequest, CreateReplicaSnapshotResponse,
+            CreateSnapshotCloneRequest, DestroySnapshotRequest, ListSnapshotCloneRequest,
+            ListSnapshotCloneResponse, ListSnapshotsRequest, ListSnapshotsResponse, Nexus,
+            NexusCreateSnapshotReplicaDescriptor, NexusCreateSnapshotReplicaStatus,
+            NexusCreateSnapshotRequest, NexusCreateSnapshotResponse, SnapshotInfo,
         };
     }
 

diff --git a/tests/bdd/features/snapshot/restore/test_delete.py b/tests/bdd/features/snapshot/restore/test_delete.py
@@ -140,9 +140,6 @@ def the_pool_space_usage_should_be_zero():
 def the_pool_space_usage_should_reflect_the_original_volume(original_volume):
     """the pool space usage should reflect the original volume."""
     pool = ApiClient.pools_api().get_pool(POOL)
-    # Bug, dataplane caches allocated, requires a restart until fixed
-    Docker.restart_container(NODE)
-    wait_node_online(NODE)
     volume = Volume.update(original_volume, cached=False)
     assert pool.state.used == volume.state.usage.allocated
 
@@ -264,8 +261,6 @@ def the_restored_volume_1_snapshot_1_allocation_size_should_be_12mib(
     restored_1_snapshot_1,
 ):
     """the restored volume 1 snapshot 1 allocation size should be 12MiB."""
-    Docker.restart_container(NODE)
-    wait_node_online(NODE)
     Cluster.wait_cache_update()
     snapshot = Snapshot.update(restored_1_snapshot_1)
     assert snapshot.state.allocated_size == 12 * 1024 * 1024
@@ -438,9 +433,6 @@ def the_pool_space_usage_should_reflect_the_snapshot_2_restored_volume_2_and_del
     restored_1_snapshot_2,
 ):
     """the pool space usage should reflect the snapshot 2, restored volume 2, and deleted snapshot and deleted restored volume 1 (16MiB)."""
-    # Bug, dataplane caches allocated, requires a restart until fixed
-    Docker.restart_container(NODE)
-    wait_node_online(NODE)
     Cluster.wait_cache_update()
 
     pool = ApiClient.pools_api().get_pool(POOL)