admin/milvus
1
0
Fork 0
mirror of https://gitee.com/milvus-io/milvus.git synced 2025-12-28 14:35:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

enhance: disallow the file resource interface before release (#46362)

Browse Source 
relate: https://github.com/milvus-io/milvus/issues/43687

<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->
## Summary by CodeRabbit

* **Chores**
* File resource operations (add, remove, list) are now unavailable and
return a not-implemented response.
* **Tests**
* Tests updated to expect error responses for those file resource
operations and removed some previous coordination-path assertions.

<sub>✏️ Tip: You can customize this high-level summary in your review
settings.</sub>
<!-- end of auto-generated comment: release notes by coderabbit.ai -->

Signed-off-by: aoiasd <zhicheng.yue@zilliz.com>
This commit is contained in:
aoiasd 2025-12-24 17:23:19 +08:00 committed by GitHub
parent 1cae4a6194
commit 7c714b0035
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 83 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
internal/proxy/impl.go
View File

@ -6776,19 +6776,20 @@ func (node *Proxy) AddFileResource(ctx context.Context, req *milvuspb.AddFileRes
}
log.Info("receive AddFileResource request")
return merr.Status(errors.New("AddFileResource is not implemented")), nil
status, err := node.mixCoord.AddFileResource(ctx, req)
if err != nil {
log.Warn("AddFileResource fail", zap.Error(err))
return merr.Status(err), nil
}
if err = merr.Error(status); err != nil {
log.Warn("AddFileResource fail", zap.Error(err))
return merr.Status(err), nil
}
// status, err := node.mixCoord.AddFileResource(ctx, req)
// if err != nil {
// log.Warn("AddFileResource fail", zap.Error(err))
// return merr.Status(err), nil
// }
// if err = merr.Error(status); err != nil {
// log.Warn("AddFileResource fail", zap.Error(err))
// return merr.Status(err), nil
// }
log.Info("AddFileResource success")
return status, nil
// log.Info("AddFileResource success")
// return status, nil
}
// RemoveFileResource remove file resource from rootcoord
@ -6805,19 +6806,20 @@ func (node *Proxy) RemoveFileResource(ctx context.Context, req *milvuspb.RemoveF
}
log.Info("receive RemoveFileResource request")
return merr.Status(errors.New("RemoveFileResource is not implemented")), nil
status, err := node.mixCoord.RemoveFileResource(ctx, req)
if err != nil {
log.Warn("RemoveFileResource fail", zap.Error(err))
return merr.Status(err), nil
}
if err = merr.Error(status); err != nil {
log.Warn("RemoveFileResource fail", zap.Error(err))
return merr.Status(err), nil
}
// status, err := node.mixCoord.RemoveFileResource(ctx, req)
// if err != nil {
// log.Warn("RemoveFileResource fail", zap.Error(err))
// return merr.Status(err), nil
// }
// if err = merr.Error(status); err != nil {
// log.Warn("RemoveFileResource fail", zap.Error(err))
// return merr.Status(err), nil
// }
log.Info("RemoveFileResource success")
return status, nil
// log.Info("RemoveFileResource success")
// return status, nil
}
// ListFileResources list file resources from rootcoord
@ -6834,23 +6836,26 @@ func (node *Proxy) ListFileResources(ctx context.Context, req *milvuspb.ListFile
}
log.Info("receive ListFileResources request")
return &milvuspb.ListFileResourcesResponse{
Status: merr.Status(errors.New("ListFileResources is not implemented")),
}, nil
resp, err := node.mixCoord.ListFileResources(ctx, req)
if err != nil {
log.Warn("ListFileResources fail", zap.Error(err))
return &milvuspb.ListFileResourcesResponse{
Status: merr.Status(err),
}, nil
}
if err = merr.Error(resp.GetStatus()); err != nil {
log.Warn("ListFileResources fail", zap.Error(err))
return &milvuspb.ListFileResourcesResponse{
Status: merr.Status(err),
}, nil
}
// resp, err := node.mixCoord.ListFileResources(ctx, req)
// if err != nil {
// log.Warn("ListFileResources fail", zap.Error(err))
// return &milvuspb.ListFileResourcesResponse{
// Status: merr.Status(err),
// }, nil
// }
// if err = merr.Error(resp.GetStatus()); err != nil {
// log.Warn("ListFileResources fail", zap.Error(err))
// return &milvuspb.ListFileResourcesResponse{
// Status: merr.Status(err),
// }, nil
// }
log.Info("ListFileResources success", zap.Int("count", len(resp.GetResources())))
return resp, nil
// log.Info("ListFileResources success", zap.Int("count", len(resp.GetResources())))
// return resp, nil
}
// UpdateReplicateConfiguration applies a full replacement of the current replication configuration across Milvus clusters.

84
internal/proxy/impl_test.go
View File

@ -1833,7 +1833,7 @@ func TestProxy_AddFileResource(t *testing.T) {
resp, err := proxy.AddFileResource(context.Background(), req)
assert.NoError(t, err)
assert.NoError(t, merr.Error(resp))
assert.Error(t, merr.Error(resp))
})
t.Run("proxy not healthy", func(t *testing.T) {
@ -1850,23 +1850,23 @@ func TestProxy_AddFileResource(t *testing.T) {
assert.Error(t, merr.Error(resp))
})
t.Run("mixCoord error", func(t *testing.T) {
proxy := &Proxy{}
proxy.UpdateStateCode(commonpb.StateCode_Healthy)
// t.Run("mixCoord error", func(t *testing.T) {
// proxy := &Proxy{}
// proxy.UpdateStateCode(commonpb.StateCode_Healthy)
mockMixCoord := mocks.NewMockMixCoordClient(t)
mockMixCoord.EXPECT().AddFileResource(mock.Anything, mock.Anything).Return(nil, fmt.Errorf("mock error"))
proxy.mixCoord = mockMixCoord
// mockMixCoord := mocks.NewMockMixCoordClient(t)
// mockMixCoord.EXPECT().AddFileResource(mock.Anything, mock.Anything).Return(nil, fmt.Errorf("mock error"))
// proxy.mixCoord = mockMixCoord
req := &milvuspb.AddFileResourceRequest{
Name: "test_resource",
Path: "/path/to/resource",
}
// req := &milvuspb.AddFileResourceRequest{
// Name: "test_resource",
// Path: "/path/to/resource",
// }
resp, err := proxy.AddFileResource(context.Background(), req)
assert.NoError(t, err)
assert.Error(t, merr.Error(resp))
})
// resp, err := proxy.AddFileResource(context.Background(), req)
// assert.NoError(t, err)
// assert.Error(t, merr.Error(resp))
// })
}
func TestProxy_RemoveFileResource(t *testing.T) {
@ -1882,7 +1882,7 @@ func TestProxy_RemoveFileResource(t *testing.T) {
resp, err := proxy.RemoveFileResource(context.Background(), req)
assert.NoError(t, err)
assert.NoError(t, merr.Error(resp))
assert.Error(t, merr.Error(resp))
})
t.Run("proxy not healthy", func(t *testing.T) {
@ -1897,22 +1897,22 @@ func TestProxy_RemoveFileResource(t *testing.T) {
assert.Error(t, merr.Error(resp))
})
t.Run("mixCoord error", func(t *testing.T) {
proxy := &Proxy{}
proxy.UpdateStateCode(commonpb.StateCode_Healthy)
// t.Run("mixCoord error", func(t *testing.T) {
// proxy := &Proxy{}
// proxy.UpdateStateCode(commonpb.StateCode_Healthy)
mockMixCoord := mocks.NewMockMixCoordClient(t)
mockMixCoord.EXPECT().RemoveFileResource(mock.Anything, mock.Anything).Return(nil, fmt.Errorf("mock error"))
proxy.mixCoord = mockMixCoord
// mockMixCoord := mocks.NewMockMixCoordClient(t)
// mockMixCoord.EXPECT().RemoveFileResource(mock.Anything, mock.Anything).Return(nil, fmt.Errorf("mock error"))
// proxy.mixCoord = mockMixCoord
req := &milvuspb.RemoveFileResourceRequest{
Name: "test_resource",
}
// req := &milvuspb.RemoveFileResourceRequest{
// Name: "test_resource",
// }
resp, err := proxy.RemoveFileResource(context.Background(), req)
assert.NoError(t, err)
assert.Error(t, merr.Error(resp))
})
// resp, err := proxy.RemoveFileResource(context.Background(), req)
// assert.NoError(t, err)
// assert.Error(t, merr.Error(resp))
// })
}
func TestProxy_ListFileResources(t *testing.T) {
@ -1927,9 +1927,7 @@ func TestProxy_ListFileResources(t *testing.T) {
resp, err := proxy.ListFileResources(context.Background(), req)
assert.NoError(t, err)
assert.NoError(t, merr.Error(resp.GetStatus()))
assert.NotNil(t, resp.GetResources())
assert.Equal(t, 0, len(resp.GetResources())) // Mock returns empty list
assert.Error(t, merr.Error(resp.GetStatus()))
})
t.Run("proxy not healthy", func(t *testing.T) {
@ -1942,19 +1940,19 @@ func TestProxy_ListFileResources(t *testing.T) {
assert.Error(t, merr.Error(resp.GetStatus()))
})
t.Run("mixCoord error", func(t *testing.T) {
proxy := &Proxy{}
proxy.UpdateStateCode(commonpb.StateCode_Healthy)
// t.Run("mixCoord error", func(t *testing.T) {
// proxy := &Proxy{}
// proxy.UpdateStateCode(commonpb.StateCode_Healthy)
mockMixCoord := mocks.NewMockMixCoordClient(t)
mockMixCoord.EXPECT().ListFileResources(mock.Anything, mock.Anything).Return(nil, fmt.Errorf("mock error"))
proxy.mixCoord = mockMixCoord
// mockMixCoord := mocks.NewMockMixCoordClient(t)
// mockMixCoord.EXPECT().ListFileResources(mock.Anything, mock.Anything).Return(nil, fmt.Errorf("mock error"))
// proxy.mixCoord = mockMixCoord
req := &milvuspb.ListFileResourcesRequest{}
resp, err := proxy.ListFileResources(context.Background(), req)
assert.NoError(t, err)
assert.Error(t, merr.Error(resp.GetStatus()))
})
// req := &milvuspb.ListFileResourcesRequest{}
// resp, err := proxy.ListFileResources(context.Background(), req)
// assert.NoError(t, err)
// assert.Error(t, merr.Error(resp.GetStatus()))
// })
}
func TestProxy_ComputePhraseMatchSlop(t *testing.T) {