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

Remove saved objects code #110

Merged
merged 2 commits into from
Mar 1, 2021
Merged

Remove saved objects code #110

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e047770
Remove saved objects code
aleksmaus Mar 1, 2021
ffabb96
Make check happy
aleksmaus Mar 1, 2021
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
15 changes: 8 additions & 7 deletions cmd/fleet/bulkCheckin.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,16 @@ import (

"github.com/elastic/fleet-server/v7/internal/pkg/bulk"
"github.com/elastic/fleet-server/v7/internal/pkg/dl"
"github.com/elastic/fleet-server/v7/internal/pkg/saved"

"github.com/rs/zerolog/log"
)

type Fields map[string]interface{}

const kBulkCheckinFlushInterval = 10 * time.Second

type PendingData struct {
fields saved.Fields
fields Fields
seqNo int64
}

Expand All @@ -37,10 +38,10 @@ func NewBulkCheckin(bulker bulk.Bulk) *BulkCheckin {
}
}

func (bc *BulkCheckin) CheckIn(id string, fields saved.Fields, seqno int64) error {
func (bc *BulkCheckin) CheckIn(id string, fields Fields, seqno int64) error {

if fields == nil {
fields = make(saved.Fields)
fields = make(Fields)
}

timeNow := time.Now().UTC().Format(time.RFC3339)
Expand All @@ -52,7 +53,7 @@ func (bc *BulkCheckin) CheckIn(id string, fields saved.Fields, seqno int64) erro
return nil
}

func (bc *BulkCheckin) Run(ctx context.Context, sv saved.CRUD) error {
func (bc *BulkCheckin) Run(ctx context.Context) error {

tick := time.NewTicker(kBulkCheckinFlushInterval)

Expand All @@ -61,7 +62,7 @@ LOOP:
for {
select {
case <-tick.C:
if err = bc.flush(ctx, sv); err != nil {
if err = bc.flush(ctx); err != nil {
log.Error().Err(err).Msg("Eat bulk checkin error; Keep on truckin'")
err = nil
}
Expand All @@ -75,7 +76,7 @@ LOOP:
return err
}

func (bc *BulkCheckin) flush(ctx context.Context, sv saved.CRUD) error {
func (bc *BulkCheckin) flush(ctx context.Context) error {
start := time.Now()

bc.mut.Lock()
Expand Down
36 changes: 0 additions & 36 deletions cmd/fleet/dsl.go
View file
Open in desktop

This file was deleted.

7 changes: 3 additions & 4 deletions cmd/fleet/handleCheckin.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ import (
"github.com/elastic/fleet-server/v7/internal/pkg/model"
"github.com/elastic/fleet-server/v7/internal/pkg/monitor"
"github.com/elastic/fleet-server/v7/internal/pkg/policy"
"github.com/elastic/fleet-server/v7/internal/pkg/saved"

"github.com/julienschmidt/httprouter"
"github.com/rs/zerolog/log"
Expand Down Expand Up @@ -347,16 +346,16 @@ func findAgentByApiKeyId(ctx context.Context, bulker bulk.Bulk, id string) (*mod

// parseMeta compares the agent and the request local_metadata content
// and returns fields to update the agent record or nil
func parseMeta(agent *model.Agent, req *CheckinRequest) (fields saved.Fields, err error) {
func parseMeta(agent *model.Agent, req *CheckinRequest) (fields Fields, err error) {
// Quick comparison first
if bytes.Equal(req.LocalMeta, agent.LocalMetadata) {
log.Trace().Msg("Quick comparing local metadata is equal")
return nil, nil
}

// Compare local_metadata content and update if different
var reqLocalMeta saved.Fields
var agentLocalMeta saved.Fields
var reqLocalMeta Fields
var agentLocalMeta Fields
err = json.Unmarshal(req.LocalMeta, &reqLocalMeta)
if err != nil {
return nil, err
Expand Down
6 changes: 1 addition & 5 deletions cmd/fleet/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ import (
"github.com/elastic/fleet-server/v7/internal/pkg/policy"
"github.com/elastic/fleet-server/v7/internal/pkg/profile"
"github.com/elastic/fleet-server/v7/internal/pkg/reload"
"github.com/elastic/fleet-server/v7/internal/pkg/saved"
"github.com/elastic/fleet-server/v7/internal/pkg/signal"
"github.com/elastic/fleet-server/v7/internal/pkg/status"

Expand Down Expand Up @@ -469,7 +468,6 @@ func (f *FleetServer) runServer(ctx context.Context, cfg *config.Config) (err er
if err != nil {
return err
}
sv := saved.NewMgr(bulker, savedObjectKey())

// Replacing to errgroup context
g, ctx := errgroup.WithContext(ctx)
Expand Down Expand Up @@ -512,9 +510,7 @@ func (f *FleetServer) runServer(ctx context.Context, cfg *config.Config) (err er
}

bc := NewBulkCheckin(bulker)
g.Go(loggedRunFunc(ctx, "Bulk checkin", func(ctx context.Context) error {
return bc.Run(ctx, sv)
}))
g.Go(loggedRunFunc(ctx, "Bulk checkin", bc.Run))

ct := NewCheckinT(f.cfg, f.cache, bc, pm, am, ad, tr, bulker)
et, err := NewEnrollerT(&f.cfg.Inputs[0].Server, bulker, f.cache)
Expand Down
121 changes: 0 additions & 121 deletions internal/pkg/migrate/migrate.go
View file
Open in desktop

This file was deleted.

Loading