Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: subscription update logic #424

Merged
merged 4 commits into from
Feb 13, 2023
Merged

fix: subscription update logic #424

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
41cbc13
feat: unified proto definition
hwjiangkai Feb 2, 2023
6b7d5f1
fix: fix subscription update logic
hwjiangkai Feb 13, 2023
0f19c22
Merge branch 'main' of github.com:linkall-labs/vanus into sdk
hwjiangkai Feb 13, 2023
b2962fc
fix golint
hwjiangkai Feb 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
98 changes: 79 additions & 19 deletions internal/gateway/proxy/proxy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import (
"context"
"encoding/base64"
"encoding/binary"
stderr "errors"
"fmt"
"net"
"net/http"
Expand Down Expand Up @@ -52,6 +53,7 @@ import (
"github.com/linkall-labs/vanus/pkg/errors"
"github.com/linkall-labs/vanus/proto/pkg/cloudevents"
ctrlpb "github.com/linkall-labs/vanus/proto/pkg/controller"
metapb "github.com/linkall-labs/vanus/proto/pkg/meta"
proxypb "github.com/linkall-labs/vanus/proto/pkg/proxy"
"go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc"
"go.opentelemetry.io/otel/trace"
Expand Down Expand Up @@ -241,30 +243,34 @@ func (cp *ControllerProxy) Subscribe(req *proxypb.SubscribeRequest, stream proxy
newSink := fmt.Sprintf("http://%s:%d%s/%s",
os.Getenv("POD_IP"), cp.cfg.SinkPort, httpRequestPrefix, req.SubscriptionId)
if meta.Sink != newSink {
updateSubscriptionReq := &ctrlpb.UpdateSubscriptionRequest{
Id: subscriptionID.Uint64(),
Subscription: &ctrlpb.SubscriptionRequest{
Source: meta.Source,
Types: meta.Types,
Config: meta.Config,
Filters: meta.Filters,
Sink: newSink,
Protocol: meta.Protocol,
EventBus: meta.EventBus,
Transformer: meta.Transformer,
Name: meta.Name,
Description: meta.Description,
Disable: meta.Disable,
},
}
_, err = cp.triggerCtrl.UpdateSubscription(_ctx, updateSubscriptionReq)
if err := cp.disableSubsciption(_ctx, req, subscriptionID.Uint64()); err != nil {
log.Error(_ctx, "disable subscription failed", map[string]interface{}{
log.KeyError: err,
"id": req.SubscriptionId,
})
return err
}

_, err = cp.triggerCtrl.UpdateSubscription(_ctx, newSubscription(meta, subscriptionID.Uint64(), newSink))
if err != nil {
log.Error(_ctx, "update subscription sink failed", map[string]interface{}{
log.KeyError: err,
"id": req.SubscriptionId,
})
return err
}

resumeSubscriptionReq := &ctrlpb.ResumeSubscriptionRequest{
Id: subscriptionID.Uint64(),
}
_, err = cp.triggerCtrl.ResumeSubscription(context.Background(), resumeSubscriptionReq)
if err != nil {
log.Error(_ctx, "resume subscription failed", map[string]interface{}{
log.KeyError: err,
"id": req.SubscriptionId,
})
return err
}
}

// 2. cache subscribe info
Expand All @@ -287,8 +293,7 @@ func (cp *ControllerProxy) Subscribe(req *proxypb.SubscribeRequest, stream proxy
break
}
log.Debug(_ctx, "subscribe stream send event", map[string]interface{}{
log.KeyError: err,
"eventpb": eventpb.String(),
"eventpb": eventpb.String(),
})
err = subscribe.stream().Send(&proxypb.SubscribeResponse{
SequenceId: msg.sequenceID,
Expand Down Expand Up @@ -383,6 +388,61 @@ func ToProto(e *v2.Event) (*cloudevents.CloudEvent, error) {
return container, nil
}

func (cp *ControllerProxy) disableSubsciption(
ctx context.Context, req *proxypb.SubscribeRequest, subscriptionID uint64,
) error {
disableSubscriptionReq := &ctrlpb.DisableSubscriptionRequest{
Id: subscriptionID,
}
_, err := cp.triggerCtrl.DisableSubscription(context.Background(), disableSubscriptionReq)
if err != nil {
log.Error(ctx, "disable subscription failed", map[string]interface{}{
log.KeyError: err,
"id": req.SubscriptionId,
})
return err
}

// TODO(jiangkai): delete me after disable supports synchronization interface
retryTime := 3
disable := false
for i := 0; i < retryTime; i++ {
s, _ := cp.triggerCtrl.GetSubscription(context.Background(), &ctrlpb.GetSubscriptionRequest{
Id: subscriptionID,
})
if s.Disable {
disable = true
break
}
stdtime.Sleep(stdtime.Second)
}
if !disable {
return stderr.New("disable is not completed, please try again")
}
return nil
}

func newSubscription(
info *metapb.Subscription, subscriptionID uint64, newsink string,
) *ctrlpb.UpdateSubscriptionRequest {
return &ctrlpb.UpdateSubscriptionRequest{
Id: subscriptionID,
Subscription: &ctrlpb.SubscriptionRequest{
Source: info.Source,
Types: info.Types,
Config: info.Config,
Filters: info.Filters,
Sink: newsink,
Protocol: info.Protocol,
EventBus: info.EventBus,
Transformer: info.Transformer,
Name: info.Name,
Description: info.Description,
Disable: info.Disable,
},
}
}

func attributeFor(v interface{}) (*cloudevents.CloudEvent_CloudEventAttributeValue, error) {
vv, err := types.Validate(v)
if err != nil {
Expand Down