Skip to content

Commit 143bc70

Browse files
kheinakheina
authored
Revert "Controller Liveliness Query Split (#5602)" (#5619)
This reverts commit 6c0b3a8.
1 parent 8b9d5cb commit 143bc70

File tree

3 files changed

+2
-164
lines changed

3 files changed

+2
-164
lines changed

‎internal/daemon/controller/tickers.go‎

Lines changed: 2 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ func (c *Controller) startStatusTicking(cancelCtx context.Context) {
3636
return
3737

3838
case <-timer.C:
39-
if err := c.updateController(cancelCtx); err != nil {
39+
if err := c.upsertController(cancelCtx); err != nil {
4040
event.WriteError(cancelCtx, op, err, event.WithInfoMsg("error fetching repository for status update"))
4141
}
4242
timer.Reset(statusInterval)
@@ -54,36 +54,13 @@ func (c *Controller) upsertController(ctx context.Context) error {
5454
opts = append(opts, server.WithAddress(c.conf.RawConfig.Controller.PublicClusterAddr))
5555
}
5656

57-
controller := server.NewController(c.conf.RawConfig.Controller.Name, opts...)
58-
repo, err := c.ServersRepoFn()
59-
if err != nil {
60-
return errors.Wrap(ctx, err, op, errors.WithMsg("error fetching repository for status upsert"))
61-
}
62-
63-
_, err = repo.UpsertController(ctx, controller)
64-
if err != nil {
65-
return errors.Wrap(ctx, err, op, errors.WithMsg("error performing status upsert"))
66-
}
67-
68-
return nil
69-
}
70-
71-
func (c *Controller) updateController(ctx context.Context) error {
72-
const op = "controller.(Controller).updateController"
73-
var opts []server.Option
74-
if c.conf.RawConfig.Controller.Description != "" {
75-
opts = append(opts, server.WithDescription(c.conf.RawConfig.Controller.Description))
76-
}
77-
if c.conf.RawConfig.Controller.PublicClusterAddr != "" {
78-
opts = append(opts, server.WithAddress(c.conf.RawConfig.Controller.PublicClusterAddr))
79-
}
8057
controller := server.NewController(c.conf.RawConfig.Controller.Name, opts...)
8158
repo, err := c.ServersRepoFn()
8259
if err != nil {
8360
return errors.Wrap(ctx, err, op, errors.WithMsg("error fetching repository for status update"))
8461
}
8562

86-
_, err = repo.UpdateController(ctx, controller)
63+
_, err = repo.UpsertController(ctx, controller)
8764
if err != nil {
8865
return errors.Wrap(ctx, err, op, errors.WithMsg("error performing status update"))
8966
}

‎internal/server/repository_controller.go‎

Lines changed: 0 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -76,40 +76,3 @@ func (r *Repository) UpsertController(ctx context.Context, controller *Controlle
7676

7777
return int(rowsUpdated), nil
7878
}
79-
80-
func (r *Repository) UpdateController(ctx context.Context, controller *Controller) (int, error) {
81-
const op = "server.(Repository).UpdateController"
82-
83-
if controller == nil {
84-
return db.NoRowsAffected, errors.New(ctx, errors.InvalidParameter, op, "controller is nil")
85-
}
86-
if controller.PrivateId == "" {
87-
return db.NoRowsAffected, errors.New(ctx, errors.InvalidParameter, op, "controller private_id is empty")
88-
}
89-
if controller.Address == "" {
90-
return db.NoRowsAffected, errors.New(ctx, errors.InvalidParameter, op, "controller address is empty")
91-
}
92-
93-
var rowsUpdated int
94-
_, err := r.writer.DoTx(
95-
ctx,
96-
db.StdRetryCnt,
97-
db.ExpBackoff{},
98-
func(reader db.Reader, w db.Writer) error {
99-
var err error
100-
rowsUpdated, err = w.Update(ctx, controller, []string{"description", "address"}, nil, db.WithWhere("private_id = ?", controller.PrivateId))
101-
if err != nil {
102-
return errors.Wrap(ctx, err, op+":Update")
103-
}
104-
if rowsUpdated > 1 {
105-
return errors.New(ctx, errors.MultipleRecords, op, "more than 1 resource would have been updated")
106-
}
107-
return nil
108-
},
109-
)
110-
if err != nil {
111-
return db.NoRowsAffected, err
112-
}
113-
114-
return rowsUpdated, nil
115-
}

‎internal/server/repository_controller_test.go‎

Lines changed: 0 additions & 102 deletions
Original file line numberDiff line numberDiff line change
@@ -81,105 +81,3 @@ func TestRepository_UpsertController(t *testing.T) {
8181
})
8282
}
8383
}
84-
85-
func TestRepository_UpdateController(t *testing.T) {
86-
ctx := context.Background()
87-
conn, _ := db.TestSetup(t, "postgres")
88-
rw := db.New(conn)
89-
wrapper := db.TestWrapper(t)
90-
testKms := kms.TestKms(t, conn, wrapper)
91-
testRepo, err := NewRepository(ctx, rw, rw, testKms)
92-
require.NoError(t, err)
93-
94-
iamRepo := iam.TestRepo(t, conn, wrapper)
95-
iam.TestScopes(t, iamRepo)
96-
97-
tests := []struct {
98-
name string
99-
originalController *Controller
100-
updatedController *Controller
101-
wantCount int
102-
wantErr bool
103-
}{
104-
{
105-
name: "nil-controller",
106-
wantErr: true,
107-
},
108-
{
109-
name: "empty-id",
110-
updatedController: NewController("", WithAddress("127.0.0.1")),
111-
wantErr: true,
112-
},
113-
{
114-
name: "empty-address",
115-
updatedController: NewController("test-controller"),
116-
wantErr: true,
117-
},
118-
{
119-
name: "controller-not-found",
120-
updatedController: NewController("test-controller", WithAddress("127.0.0.1"), WithDescription("new ipv4 description")),
121-
wantErr: true,
122-
},
123-
{
124-
name: "valid-ipv4-controller",
125-
originalController: NewController("ipv4-controller", WithAddress("127.0.0.1"), WithDescription("ipv4 description")),
126-
updatedController: NewController("ipv4-controller", WithAddress("127.0.0.2"), WithDescription("new ipv4 description")),
127-
wantCount: 1,
128-
},
129-
{
130-
name: "valid-ipv6-controller",
131-
originalController: NewController("test-ipv6-controller", WithAddress("[2001:4860:4860:0:0:0:0:8888]"), WithDescription("ipv6 description")),
132-
updatedController: NewController("test-ipv6-controller", WithAddress("[2001:4860:4860:0:0:0:0:9999]"), WithDescription("new ipv6 description")),
133-
wantCount: 1,
134-
},
135-
{
136-
name: "valid-abbreviated-ipv6-controller",
137-
originalController: NewController("test-abbreviated-ipv6-controller", WithAddress("[2001:4860:4860::8888]"), WithDescription("abbreviated ipv6 description")),
138-
updatedController: NewController("test-abbreviated-ipv6-controller", WithAddress("[2001:4860:4860::9999]"), WithDescription("new abbreviated ipv6 description")),
139-
wantCount: 1,
140-
},
141-
{
142-
name: "valid-controller-short-name",
143-
originalController: NewController("test", WithAddress("127.0.0.1"), WithDescription("short name description")),
144-
updatedController: NewController("test", WithAddress("127.0.0.2"), WithDescription("new short name description")),
145-
wantCount: 1,
146-
},
147-
}
148-
for _, tt := range tests {
149-
t.Run(tt.name, func(t *testing.T) {
150-
assert, require := assert.New(t), require.New(t)
151-
152-
var originalControllerEntry *Controller
153-
// Insert the original controller attributes if they exist
154-
if tt.originalController != nil {
155-
_, err := testRepo.UpsertController(ctx, tt.originalController)
156-
require.NoError(err)
157-
158-
// Retrieve the original controller in the database
159-
controllerList, err := testRepo.ListControllers(ctx, []Option{}...)
160-
require.NoError(err)
161-
originalControllerEntry = controllerList[len(controllerList)-1]
162-
}
163-
164-
// Update the controller with the updated attributes
165-
got, err := testRepo.UpdateController(ctx, tt.updatedController)
166-
if tt.wantErr {
167-
require.Error(err)
168-
assert.Equal(0, got)
169-
return
170-
}
171-
require.NoError(err)
172-
assert.Equal(tt.wantCount, got)
173-
174-
// Retrieve the updated controller in the database and assert updated successfully
175-
controllerList, err := testRepo.ListControllers(ctx, []Option{}...)
176-
require.NoError(err)
177-
updatedControllerEntry := controllerList[len(controllerList)-1]
178-
179-
assert.Equal(tt.updatedController.PrivateId, updatedControllerEntry.PrivateId)
180-
assert.Equal(tt.updatedController.Address, updatedControllerEntry.Address)
181-
assert.Equal(tt.updatedController.Description, updatedControllerEntry.Description)
182-
assert.True(updatedControllerEntry.UpdateTime.AsTime().After(originalControllerEntry.UpdateTime.AsTime()))
183-
})
184-
}
185-
}

0 commit comments

Comments
 (0)