Skip to content

Commit

Permalink
enhance: Append create partition msg to wal (milvus-io#35398)
Browse files Browse the repository at this point in the history
issue: milvus-io#33285

---------

Signed-off-by: bigsheeper <[email protected]>
  • Loading branch information
bigsheeper authored Aug 13, 2024
1 parent 16b0aee commit efadf22
Show file tree
Hide file tree
Showing 7 changed files with 141 additions and 8 deletions.
11 changes: 4 additions & 7 deletions internal/distributed/streaming/streaming.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,6 @@ import (

var singleton WALAccesser = nil

func SetWAL(w WALAccesser) {
singleton = w
}

// Init initializes the wal accesser with the given etcd client.
// should be called before any other operations.
func Init() {
Expand All @@ -23,9 +19,7 @@ func Init() {

// Release releases the resources of the wal accesser.
func Release() {
if w, ok := singleton.(*walAccesserImpl); ok && w != nil {
w.Close()
}
singleton.Close()
}

// WAL is the entrance to interact with the milvus write ahead log.
Expand Down Expand Up @@ -67,4 +61,7 @@ type WALAccesser interface {

// Read returns a scanner for reading records from the wal.
Read(ctx context.Context, opts ReadOption) Scanner

// Close closes the wal accesser
Close()
}
24 changes: 24 additions & 0 deletions internal/distributed/streaming/test_streaming.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
// Licensed to the LF AI & Data foundation under one
// or more contributor license agreements. See the NOTICE file
// distributed with this work for additional information
// regarding copyright ownership. The ASF licenses this file
// to you under the Apache License, Version 2.0 (the
// "License"); you may not use this file except in compliance
// with the License. You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

//go:build test

package streaming

// SetWALForTest initializes the singleton of wal for test.
func SetWALForTest(w WALAccesser) {
singleton = w
}
32 changes: 32 additions & 0 deletions internal/mocks/distributed/mock_streaming/mock_WALAccesser.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions internal/rootcoord/create_partition_task.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import (
"github.com/milvus-io/milvus-proto/go-api/v2/milvuspb"
"github.com/milvus-io/milvus/internal/metastore/model"
pb "github.com/milvus-io/milvus/internal/proto/etcdpb"
"github.com/milvus-io/milvus/internal/util/streamingutil"
"github.com/milvus-io/milvus/pkg/log"
)

Expand Down Expand Up @@ -96,6 +97,14 @@ func (t *createPartitionTask) Execute(ctx context.Context) error {
ts: t.GetTs(),
})

if streamingutil.IsStreamingServiceEnabled() {
undoTask.AddStep(&broadcastCreatePartitionMsgStep{
baseStep: baseStep{core: t.core},
vchannels: t.collMeta.VirtualChannelNames,
partition: partition,
}, &nullStep{})
}

undoTask.AddStep(&nullStep{}, &releasePartitionsStep{
baseStep: baseStep{core: t.core},
collectionID: t.collMeta.CollectionID,
Expand Down
2 changes: 1 addition & 1 deletion internal/rootcoord/garbage_collector_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -548,7 +548,7 @@ func TestGcPartitionData(t *testing.T) {

wal := mock_streaming.NewMockWALAccesser(t)
wal.EXPECT().Append(mock.Anything, mock.Anything, mock.Anything).Return(streaming.AppendResponses{})
streaming.SetWAL(wal)
streaming.SetWALForTest(wal)

tsoAllocator := mocktso.NewAllocator(t)
tsoAllocator.EXPECT().GenerateTSO(mock.Anything).Return(1000, nil)
Expand Down
48 changes: 48 additions & 0 deletions internal/rootcoord/step.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,15 @@ import (
"fmt"
"time"

"github.com/milvus-io/milvus-proto/go-api/v2/commonpb"
"github.com/milvus-io/milvus-proto/go-api/v2/milvuspb"
"github.com/milvus-io/milvus-proto/go-api/v2/msgpb"
"github.com/milvus-io/milvus/internal/distributed/streaming"
"github.com/milvus-io/milvus/internal/metastore/model"
pb "github.com/milvus-io/milvus/internal/proto/etcdpb"
"github.com/milvus-io/milvus/internal/util/proxyutil"
"github.com/milvus-io/milvus/pkg/streaming/util/message"
"github.com/milvus-io/milvus/pkg/util/commonpbutil"
)

type stepPriority int
Expand Down Expand Up @@ -374,6 +379,49 @@ func (s *addPartitionMetaStep) Desc() string {
return fmt.Sprintf("add partition to meta table, collection: %d, partition: %d", s.partition.CollectionID, s.partition.PartitionID)
}

type broadcastCreatePartitionMsgStep struct {
baseStep
vchannels []string
partition *model.Partition
}

func (s *broadcastCreatePartitionMsgStep) Execute(ctx context.Context) ([]nestedStep, error) {
req := &msgpb.CreatePartitionRequest{
Base: commonpbutil.NewMsgBase(
commonpbutil.WithMsgType(commonpb.MsgType_CreatePartition),
commonpbutil.WithTimeStamp(0), // ts is given by streamingnode.
),
PartitionName: s.partition.PartitionName,
CollectionID: s.partition.CollectionID,
PartitionID: s.partition.PartitionID,
}

msgs := make([]message.MutableMessage, 0, len(s.vchannels))
for _, vchannel := range s.vchannels {
msg, err := message.NewCreatePartitionMessageBuilderV1().
WithVChannel(vchannel).
WithHeader(&message.CreatePartitionMessageHeader{
CollectionId: s.partition.CollectionID,
PartitionId: s.partition.PartitionID,
}).
WithBody(req).
BuildMutable()
if err != nil {
return nil, err
}
msgs = append(msgs, msg)
}
resp := streaming.WAL().Append(ctx, msgs...)
if err := resp.IsAnyError(); err != nil {

Check failure on line 415 in internal/rootcoord/step.go

View workflow job for this annotation

GitHub Actions / Code Checker MacOS 12

resp.IsAnyError undefined (type "github.com/milvus-io/milvus/internal/distributed/streaming".AppendResponses has no field or method IsAnyError)
return nil, err
}
return nil, nil
}

func (s *broadcastCreatePartitionMsgStep) Desc() string {
return fmt.Sprintf("broadcast create partition message to mq, collection: %d, partition: %d", s.partition.CollectionID, s.partition.PartitionID)
}

type changePartitionStateStep struct {
baseStep
collectionID UniqueID
Expand Down
23 changes: 23 additions & 0 deletions internal/rootcoord/step_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,11 @@ import (
"time"

"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"

"github.com/milvus-io/milvus/internal/distributed/streaming"
"github.com/milvus-io/milvus/internal/metastore/model"
"github.com/milvus-io/milvus/internal/mocks/distributed/mock_streaming"
)

func Test_waitForTsSyncedStep_Execute(t *testing.T) {
Expand Down Expand Up @@ -115,3 +120,21 @@ func TestSkip(t *testing.T) {
assert.NoError(t, err)
}
}

func TestBroadcastCreatePartitionMsgStep(t *testing.T) {
wal := mock_streaming.NewMockWALAccesser(t)
wal.EXPECT().Append(mock.Anything, mock.Anything, mock.Anything).Return(streaming.AppendResponses{})
streaming.SetWALForTest(wal)

step := &broadcastCreatePartitionMsgStep{
baseStep: baseStep{core: nil},
vchannels: []string{"ch-0", "ch-1"},
partition: &model.Partition{
CollectionID: 1,
PartitionID: 2,
},
}
t.Logf("%v\n", step.Desc())
_, err := step.Execute(context.Background())
assert.NoError(t, err)
}

0 comments on commit efadf22

Please sign in to comment.