H-A-227: answer an object store's fill from its stream's own figures
The fill was a listing of every description in the store, deleted chunks' leftovers included; a receiver reading it per chunk made one connection read about 14 MB/s. The fill is now one stream info request: its bytes, its cap, and its live subjects as the count. Builds: design 47 H H-A-227
This commit is contained in:
@@ -196,19 +196,28 @@ func (c *Conn) ObjectsList(module string, r buscalls.ObjectsRequest) (buscalls.O
|
||||
return out, nil
|
||||
}
|
||||
|
||||
// ObjectsInfo is how full the module's object store is: its objects, its bytes and its cap.
|
||||
// ObjectsInfo is how full the module's object store is, from the figures the bus keeps for its stream: its bytes, its
|
||||
// messages' live subjects as the count, and its cap. It never lists the store: a store's descriptions, the leftovers
|
||||
// of deleted objects among them, may be many thousands, and a fill read per chunk of a transfer read them all each
|
||||
// time (design 47 H lead answers H-A-227).
|
||||
func (c *Conn) ObjectsInfo(module string, r buscalls.ObjectsRequest) (buscalls.Fill, error) {
|
||||
listed, err := c.ObjectsList(module, r)
|
||||
b, err := c.objectBucketOf(module, r.Objects)
|
||||
if err != nil {
|
||||
return buscalls.Fill{}, err
|
||||
}
|
||||
b, _ := c.objectBucketOf(module, r.Objects)
|
||||
fill, err := c.streamFill("OBJ_" + b.ObjectStore)
|
||||
info, err := c.streamInfo("OBJ_" + b.ObjectStore)
|
||||
if err != nil {
|
||||
return buscalls.Fill{}, err
|
||||
}
|
||||
fill.Count = uint64(len(listed.Objects))
|
||||
return fill.Fill, nil
|
||||
return objectsFillOf(info), nil
|
||||
}
|
||||
|
||||
// objectsFillOf is an object store's fill from its stream's info alone: the bytes the stream keeps, its live subjects
|
||||
// as the count (H-A-227: the stream's live subjects, or none) and its cap.
|
||||
func objectsFillOf(info *jetstream.StreamInfo) buscalls.Fill {
|
||||
fill := streamFillOf(info).Fill
|
||||
fill.Count = uint64(info.State.NumSubjects)
|
||||
return fill
|
||||
}
|
||||
|
||||
// ObjectsWatch hands deliver every object of the module's object store as it is, then each stored or deleted.
|
||||
@@ -261,29 +270,39 @@ func (c *Conn) ObjectsWatch(module string, r buscalls.ObjectsWatchRequest, deliv
|
||||
|
||||
// streamFill is a stream's fill and its first and last sequence, by its name on the bus.
|
||||
func (c *Conn) streamFill(name string) (buscalls.StreamFilled, error) {
|
||||
info, err := c.streamInfo(name)
|
||||
if err != nil {
|
||||
return buscalls.StreamFilled{}, err
|
||||
}
|
||||
return streamFillOf(info), nil
|
||||
}
|
||||
|
||||
// streamInfo is a stream's info as the bus keeps it, by its name on the bus: one request, whatever the stream holds.
|
||||
func (c *Conn) streamInfo(name string) (*jetstream.StreamInfo, error) {
|
||||
ctx, cancel := context.WithTimeout(context.Background(), StateTimeout)
|
||||
defer cancel()
|
||||
js, err := c.JetStream()
|
||||
if err != nil {
|
||||
return buscalls.StreamFilled{}, err
|
||||
return nil, err
|
||||
}
|
||||
s, err := js.Stream(ctx, name)
|
||||
if errors.Is(err, jetstream.ErrStreamNotFound) {
|
||||
return buscalls.StreamFilled{}, fmt.Errorf("the stream %s is bound and not on the bus", name)
|
||||
return nil, fmt.Errorf("the stream %s is bound and not on the bus", name)
|
||||
}
|
||||
if err != nil {
|
||||
return buscalls.StreamFilled{}, err
|
||||
}
|
||||
info, err := s.Info(ctx)
|
||||
if err != nil {
|
||||
return buscalls.StreamFilled{}, err
|
||||
return nil, err
|
||||
}
|
||||
return s.Info(ctx)
|
||||
}
|
||||
|
||||
// streamFillOf is a stream's fill and its first and last sequence from its info.
|
||||
func streamFillOf(info *jetstream.StreamInfo) buscalls.StreamFilled {
|
||||
max := uint64(0)
|
||||
if info.Config.MaxBytes > 0 {
|
||||
max = uint64(info.Config.MaxBytes)
|
||||
}
|
||||
return buscalls.StreamFilled{Fill: buscalls.Fill{Count: info.State.Msgs, Bytes: info.State.Bytes, MaxBytes: max},
|
||||
First: info.State.FirstSeq, Last: info.State.LastSeq}, nil
|
||||
First: info.State.FirstSeq, Last: info.State.LastSeq}
|
||||
}
|
||||
|
||||
// streamBinding is the module's binding of a stream by its local name, a work queue among them.
|
||||
|
||||
Reference in New Issue
Block a user