mirrors/ceph-csi
1
0
Fork 0
mirror of https://github.com/ceph/ceph-csi.git synced 2024-11-22 14:20:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

util: log repication RequestID

Browse Source 
currently we are not logging the RequestID
for the replication RPC calls. This PR
adds the replication case to the getReqID
function.

Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
This commit is contained in:
Madhu Rajanna 2024-02-13 08:00:21 +01:00 committed by mergify[bot]
parent 492e43639c
commit 4e296bf65e
2 changed files with 35 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
internal/csi-common/utils.go
View File

@ -28,6 +28,7 @@ import (
"github.com/ceph/ceph-csi/internal/util/log" "github.com/ceph/ceph-csi/internal/util/log"
"github.com/container-storage-interface/spec/lib/go/csi" "github.com/container-storage-interface/spec/lib/go/csi"
"github.com/csi-addons/spec/lib/go/replication"
grpc_middleware "github.com/grpc-ecosystem/go-grpc-middleware" grpc_middleware "github.com/grpc-ecosystem/go-grpc-middleware"
"github.com/kubernetes-csi/csi-lib-utils/protosanitizer" "github.com/kubernetes-csi/csi-lib-utils/protosanitizer"
"google.golang.org/grpc" "google.golang.org/grpc"
@ -152,6 +153,20 @@ func getReqID(req interface{}) string {
reqID = r.GroupSnapshotId reqID = r.GroupSnapshotId
case *csi.GetVolumeGroupSnapshotRequest: case *csi.GetVolumeGroupSnapshotRequest:
reqID = r.GroupSnapshotId reqID = r.GroupSnapshotId
// Replication
case *replication.EnableVolumeReplicationRequest:
reqID = r.VolumeId
case *replication.DisableVolumeReplicationRequest:
reqID = r.VolumeId
case *replication.PromoteVolumeRequest:
reqID = r.VolumeId
case *replication.DemoteVolumeRequest:
reqID = r.VolumeId
case *replication.ResyncVolumeRequest:
reqID = r.VolumeId
case *replication.GetVolumeReplicationInfoRequest:
reqID = r.VolumeId
} }
return reqID return reqID

20
internal/csi-common/utils_test.go
View File

@ -24,6 +24,7 @@ import (
"testing" "testing"
"github.com/container-storage-interface/spec/lib/go/csi" "github.com/container-storage-interface/spec/lib/go/csi"
"github.com/csi-addons/spec/lib/go/replication"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
mount "k8s.io/mount-utils" mount "k8s.io/mount-utils"
@ -75,6 +76,25 @@ func TestGetReqID(t *testing.T) {
&csi.GetVolumeGroupSnapshotRequest{ &csi.GetVolumeGroupSnapshotRequest{
GroupSnapshotId: fakeID, GroupSnapshotId: fakeID,
}, },
&replication.EnableVolumeReplicationRequest{
VolumeId: fakeID,
},
&replication.DisableVolumeReplicationRequest{
VolumeId: fakeID,
},
&replication.PromoteVolumeRequest{
VolumeId: fakeID,
},
&replication.DemoteVolumeRequest{
VolumeId: fakeID,
},
&replication.ResyncVolumeRequest{
VolumeId: fakeID,
},
&replication.GetVolumeReplicationInfoRequest{
VolumeId: fakeID,
},
} }
for _, r := range req { for _, r := range req {
if got := getReqID(r); got != fakeID { if got := getReqID(r); got != fakeID {