Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

chore(agent): update agent proto client#18242

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.

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

Already on GitHub?Sign in to your account

Merged
Merged
Changes fromall commits
Commits
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
32 changes: 16 additions & 16 deletionsagent/agent.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -456,7 +456,7 @@ func (t *trySingleflight) Do(key string, fn func()) {
fn()
}

func (a*agent)reportMetadata(ctx context.Context,aAPI proto.DRPCAgentClient24)error {
func (a*agent)reportMetadata(ctx context.Context,aAPI proto.DRPCAgentClient26)error {
tickerDone:=make(chanstruct{})
collectDone:=make(chanstruct{})
ctx,cancel:=context.WithCancel(ctx)
Expand DownExpand Up@@ -672,7 +672,7 @@ func (a *agent) reportMetadata(ctx context.Context, aAPI proto.DRPCAgentClient24

// reportLifecycle reports the current lifecycle state once. All state
// changes are reported in order.
func (a*agent)reportLifecycle(ctx context.Context,aAPI proto.DRPCAgentClient24)error {
func (a*agent)reportLifecycle(ctx context.Context,aAPI proto.DRPCAgentClient26)error {
for {
select {
case<-a.lifecycleUpdate:
Expand DownExpand Up@@ -752,7 +752,7 @@ func (a *agent) setLifecycle(state codersdk.WorkspaceAgentLifecycle) {
}

// reportConnectionsLoop reports connections to the agent for auditing.
func (a*agent)reportConnectionsLoop(ctx context.Context,aAPI proto.DRPCAgentClient24)error {
func (a*agent)reportConnectionsLoop(ctx context.Context,aAPI proto.DRPCAgentClient26)error {
for {
select {
case<-a.reportConnectionsUpdate:
Expand DownExpand Up@@ -872,7 +872,7 @@ func (a *agent) reportConnection(id uuid.UUID, connectionType proto.Connection_T
// fetchServiceBannerLoop fetches the service banner on an interval. It will
// not be fetched immediately; the expectation is that it is primed elsewhere
// (and must be done before the session actually starts).
func (a*agent)fetchServiceBannerLoop(ctx context.Context,aAPI proto.DRPCAgentClient24)error {
func (a*agent)fetchServiceBannerLoop(ctx context.Context,aAPI proto.DRPCAgentClient26)error {
ticker:=time.NewTicker(a.announcementBannersRefreshInterval)
deferticker.Stop()
for {
Expand DownExpand Up@@ -925,7 +925,7 @@ func (a *agent) run() (retErr error) {
connMan:=newAPIConnRoutineManager(a.gracefulCtx,a.hardCtx,a.logger,aAPI,tAPI)

connMan.startAgentAPI("init notification banners",gracefulShutdownBehaviorStop,
func(ctx context.Context,aAPI proto.DRPCAgentClient24)error {
func(ctx context.Context,aAPI proto.DRPCAgentClient26)error {
bannersProto,err:=aAPI.GetAnnouncementBanners(ctx,&proto.GetAnnouncementBannersRequest{})
iferr!=nil {
returnxerrors.Errorf("fetch service banner: %w",err)
Expand All@@ -942,7 +942,7 @@ func (a *agent) run() (retErr error) {
// sending logs gets gracefulShutdownBehaviorRemain because we want to send logs generated by
// shutdown scripts.
connMan.startAgentAPI("send logs",gracefulShutdownBehaviorRemain,
func(ctx context.Context,aAPI proto.DRPCAgentClient24)error {
func(ctx context.Context,aAPI proto.DRPCAgentClient26)error {
err:=a.logSender.SendLoop(ctx,aAPI)
ifxerrors.Is(err,agentsdk.ErrLogLimitExceeded) {
// we don't want this error to tear down the API connection and propagate to the
Expand All@@ -961,7 +961,7 @@ func (a *agent) run() (retErr error) {
connMan.startAgentAPI("report metadata",gracefulShutdownBehaviorStop,a.reportMetadata)

// resources monitor can cease as soon as we start gracefully shutting down.
connMan.startAgentAPI("resources monitor",gracefulShutdownBehaviorStop,func(ctx context.Context,aAPI proto.DRPCAgentClient24)error {
connMan.startAgentAPI("resources monitor",gracefulShutdownBehaviorStop,func(ctx context.Context,aAPI proto.DRPCAgentClient26)error {
logger:=a.logger.Named("resources_monitor")
clk:=quartz.NewReal()
config,err:=aAPI.GetResourcesMonitoringConfiguration(ctx,&proto.GetResourcesMonitoringConfigurationRequest{})
Expand DownExpand Up@@ -1008,7 +1008,7 @@ func (a *agent) run() (retErr error) {
connMan.startAgentAPI("handle manifest",gracefulShutdownBehaviorStop,a.handleManifest(manifestOK))

connMan.startAgentAPI("app health reporter",gracefulShutdownBehaviorStop,
func(ctx context.Context,aAPI proto.DRPCAgentClient24)error {
func(ctx context.Context,aAPI proto.DRPCAgentClient26)error {
iferr:=manifestOK.wait(ctx);err!=nil {
returnxerrors.Errorf("no manifest: %w",err)
}
Expand DownExpand Up@@ -1041,7 +1041,7 @@ func (a *agent) run() (retErr error) {

connMan.startAgentAPI("fetch service banner loop",gracefulShutdownBehaviorStop,a.fetchServiceBannerLoop)

connMan.startAgentAPI("stats report loop",gracefulShutdownBehaviorStop,func(ctx context.Context,aAPI proto.DRPCAgentClient24)error {
connMan.startAgentAPI("stats report loop",gracefulShutdownBehaviorStop,func(ctx context.Context,aAPI proto.DRPCAgentClient26)error {
iferr:=networkOK.wait(ctx);err!=nil {
returnxerrors.Errorf("no network: %w",err)
}
Expand All@@ -1056,8 +1056,8 @@ func (a *agent) run() (retErr error) {
}

// handleManifest returns a function that fetches and processes the manifest
func (a*agent)handleManifest(manifestOK*checkpoint)func(ctx context.Context,aAPI proto.DRPCAgentClient24)error {
returnfunc(ctx context.Context,aAPI proto.DRPCAgentClient24)error {
func (a*agent)handleManifest(manifestOK*checkpoint)func(ctx context.Context,aAPI proto.DRPCAgentClient26)error {
returnfunc(ctx context.Context,aAPI proto.DRPCAgentClient26)error {
var (
sentResult=false
errerror
Expand DownExpand Up@@ -1187,8 +1187,8 @@ func (a *agent) handleManifest(manifestOK *checkpoint) func(ctx context.Context,

// createOrUpdateNetwork waits for the manifest to be set using manifestOK, then creates or updates
// the tailnet using the information in the manifest
func (a*agent)createOrUpdateNetwork(manifestOK,networkOK*checkpoint)func(context.Context, proto.DRPCAgentClient24)error {
returnfunc(ctx context.Context,_ proto.DRPCAgentClient24) (retErrerror) {
func (a*agent)createOrUpdateNetwork(manifestOK,networkOK*checkpoint)func(context.Context, proto.DRPCAgentClient26)error {
returnfunc(ctx context.Context,_ proto.DRPCAgentClient26) (retErrerror) {
iferr:=manifestOK.wait(ctx);err!=nil {
returnxerrors.Errorf("no manifest: %w",err)
}
Expand DownExpand Up@@ -1960,7 +1960,7 @@ const (

typeapiConnRoutineManagerstruct {
logger slog.Logger
aAPI proto.DRPCAgentClient24
aAPI proto.DRPCAgentClient26
tAPI tailnetproto.DRPCTailnetClient24
eg*errgroup.Group
stopCtx context.Context
Expand All@@ -1969,7 +1969,7 @@ type apiConnRoutineManager struct {

funcnewAPIConnRoutineManager(
gracefulCtx,hardCtx context.Context,logger slog.Logger,
aAPI proto.DRPCAgentClient24,tAPI tailnetproto.DRPCTailnetClient24,
aAPI proto.DRPCAgentClient26,tAPI tailnetproto.DRPCTailnetClient24,
)*apiConnRoutineManager {
// routines that remain in operation during graceful shutdown use the remainCtx. They'll still
// exit if the errgroup hits an error, which usually means a problem with the conn.
Expand DownExpand Up@@ -2002,7 +2002,7 @@ func newAPIConnRoutineManager(
// but for Tailnet.
func (a*apiConnRoutineManager)startAgentAPI(
namestring,behaviorgracefulShutdownBehavior,
ffunc(context.Context, proto.DRPCAgentClient24)error,
ffunc(context.Context, proto.DRPCAgentClient26)error,
) {
logger:=a.logger.With(slog.F("name",name))
varctx context.Context
Expand Down
Loading
[8]ページ先頭
©2009-2025 Movatter.jp