-
Notifications
You must be signed in to change notification settings - Fork 468
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into update-gethpin-v1.13.4
- Loading branch information
Showing
11 changed files
with
933 additions
and
21 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,177 @@ | ||
| package pubsub | ||
|
|
||
| import ( | ||
| "context" | ||
| "encoding/json" | ||
| "errors" | ||
| "fmt" | ||
| "time" | ||
|
|
||
| "github.com/ethereum/go-ethereum/log" | ||
| "github.com/go-redis/redis/v8" | ||
| "github.com/google/uuid" | ||
| "github.com/offchainlabs/nitro/util/redisutil" | ||
| "github.com/offchainlabs/nitro/util/stopwaiter" | ||
| "github.com/spf13/pflag" | ||
| ) | ||
|
|
||
| type ConsumerConfig struct { | ||
| // Timeout of result entry in Redis. | ||
| ResponseEntryTimeout time.Duration `koanf:"response-entry-timeout"` | ||
| // Duration after which consumer is considered to be dead if heartbeat | ||
| // is not updated. | ||
| KeepAliveTimeout time.Duration `koanf:"keepalive-timeout"` | ||
| // Redis url for Redis streams and locks. | ||
| RedisURL string `koanf:"redis-url"` | ||
| // Redis stream name. | ||
| RedisStream string `koanf:"redis-stream"` | ||
| // Redis consumer group name. | ||
| RedisGroup string `koanf:"redis-group"` | ||
| } | ||
|
|
||
| var DefaultConsumerConfig = &ConsumerConfig{ | ||
| ResponseEntryTimeout: time.Hour, | ||
| KeepAliveTimeout: 5 * time.Minute, | ||
| RedisStream: "", | ||
| RedisGroup: "", | ||
| } | ||
|
|
||
| var DefaultTestConsumerConfig = &ConsumerConfig{ | ||
| RedisStream: "", | ||
| RedisGroup: "", | ||
| ResponseEntryTimeout: time.Minute, | ||
| KeepAliveTimeout: 30 * time.Millisecond, | ||
| } | ||
|
|
||
| func ConsumerConfigAddOptions(prefix string, f *pflag.FlagSet) { | ||
| f.Duration(prefix+".response-entry-timeout", DefaultConsumerConfig.ResponseEntryTimeout, "timeout for response entry") | ||
| f.Duration(prefix+".keepalive-timeout", DefaultConsumerConfig.KeepAliveTimeout, "timeout after which consumer is considered inactive if heartbeat wasn't performed") | ||
| f.String(prefix+".redis-url", DefaultConsumerConfig.RedisURL, "redis url for redis stream") | ||
| f.String(prefix+".redis-stream", DefaultConsumerConfig.RedisStream, "redis stream name to read from") | ||
| f.String(prefix+".redis-group", DefaultConsumerConfig.RedisGroup, "redis stream consumer group name") | ||
| } | ||
|
|
||
| // Consumer implements a consumer for redis stream provides heartbeat to | ||
| // indicate it is alive. | ||
| type Consumer[Request any, Response any] struct { | ||
| stopwaiter.StopWaiter | ||
| id string | ||
| client redis.UniversalClient | ||
| cfg *ConsumerConfig | ||
| } | ||
|
|
||
| type Message[Request any] struct { | ||
| ID string | ||
| Value Request | ||
| } | ||
|
|
||
| func NewConsumer[Request any, Response any](ctx context.Context, cfg *ConsumerConfig) (*Consumer[Request, Response], error) { | ||
| if cfg.RedisURL == "" { | ||
| return nil, fmt.Errorf("redis url cannot be empty") | ||
| } | ||
| if cfg.RedisStream == "" { | ||
| return nil, fmt.Errorf("redis stream name cannot be empty") | ||
| } | ||
| if cfg.RedisGroup == "" { | ||
| return nil, fmt.Errorf("redis group name cannot be emtpy") | ||
| } | ||
| c, err := redisutil.RedisClientFromURL(cfg.RedisURL) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| consumer := &Consumer[Request, Response]{ | ||
| id: uuid.NewString(), | ||
| client: c, | ||
| cfg: cfg, | ||
| } | ||
| return consumer, nil | ||
| } | ||
|
|
||
| // Start starts the consumer to iteratively perform heartbeat in configured intervals. | ||
| func (c *Consumer[Request, Response]) Start(ctx context.Context) { | ||
| c.StopWaiter.Start(ctx, c) | ||
| c.StopWaiter.CallIteratively( | ||
| func(ctx context.Context) time.Duration { | ||
| c.heartBeat(ctx) | ||
| return c.cfg.KeepAliveTimeout / 10 | ||
| }, | ||
| ) | ||
| } | ||
|
|
||
| func (c *Consumer[Request, Response]) StopAndWait() { | ||
| c.StopWaiter.StopAndWait() | ||
| } | ||
|
|
||
| func heartBeatKey(id string) string { | ||
| return fmt.Sprintf("consumer:%s:heartbeat", id) | ||
| } | ||
|
|
||
| func (c *Consumer[Request, Response]) heartBeatKey() string { | ||
| return heartBeatKey(c.id) | ||
| } | ||
|
|
||
| // heartBeat updates the heartBeat key indicating aliveness. | ||
| func (c *Consumer[Request, Response]) heartBeat(ctx context.Context) { | ||
| if err := c.client.Set(ctx, c.heartBeatKey(), time.Now().UnixMilli(), 2*c.cfg.KeepAliveTimeout).Err(); err != nil { | ||
| l := log.Info | ||
| if ctx.Err() != nil { | ||
| l = log.Error | ||
| } | ||
| l("Updating heardbeat", "consumer", c.id, "error", err) | ||
| } | ||
| } | ||
|
|
||
| // Consumer first checks it there exists pending message that is claimed by | ||
| // unresponsive consumer, if not then reads from the stream. | ||
| func (c *Consumer[Request, Response]) Consume(ctx context.Context) (*Message[Request], error) { | ||
| res, err := c.client.XReadGroup(ctx, &redis.XReadGroupArgs{ | ||
| Group: c.cfg.RedisGroup, | ||
| Consumer: c.id, | ||
| // Receive only messages that were never delivered to any other consumer, | ||
| // that is, only new messages. | ||
| Streams: []string{c.cfg.RedisStream, ">"}, | ||
| Count: 1, | ||
| Block: time.Millisecond, // 0 seems to block the read instead of immediately returning | ||
| }).Result() | ||
| if errors.Is(err, redis.Nil) { | ||
| return nil, nil | ||
| } | ||
| if err != nil { | ||
| return nil, fmt.Errorf("reading message for consumer: %q: %w", c.id, err) | ||
| } | ||
| if len(res) != 1 || len(res[0].Messages) != 1 { | ||
| return nil, fmt.Errorf("redis returned entries: %+v, for querying single message", res) | ||
| } | ||
| log.Debug(fmt.Sprintf("Consumer: %s consuming message: %s", c.id, res[0].Messages[0].ID)) | ||
| var ( | ||
| value = res[0].Messages[0].Values[messageKey] | ||
| data, ok = (value).(string) | ||
| ) | ||
| if !ok { | ||
| return nil, fmt.Errorf("casting request to string: %w", err) | ||
| } | ||
| var req Request | ||
| if err := json.Unmarshal([]byte(data), &req); err != nil { | ||
| return nil, fmt.Errorf("unmarshaling value: %v, error: %w", value, err) | ||
| } | ||
|
|
||
| return &Message[Request]{ | ||
| ID: res[0].Messages[0].ID, | ||
| Value: req, | ||
| }, nil | ||
| } | ||
|
|
||
| func (c *Consumer[Request, Response]) SetResult(ctx context.Context, messageID string, result Response) error { | ||
| resp, err := json.Marshal(result) | ||
| if err != nil { | ||
| return fmt.Errorf("marshaling result: %w", err) | ||
| } | ||
| acquired, err := c.client.SetNX(ctx, messageID, resp, c.cfg.ResponseEntryTimeout).Result() | ||
| if err != nil || !acquired { | ||
| return fmt.Errorf("setting result for message: %v, error: %w", messageID, err) | ||
| } | ||
| if _, err := c.client.XAck(ctx, c.cfg.RedisStream, c.cfg.RedisGroup, messageID).Result(); err != nil { | ||
| return fmt.Errorf("acking message: %v, error: %w", messageID, err) | ||
| } | ||
| return nil | ||
| } |
Oops, something went wrong.