Skip to content

feat: add provisioner job hang detector #7927

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

Merged
merged 13 commits into from
Jun 25, 2023
Merged

feat: add provisioner job hang detector #7927

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
a38e949
feat: add provisioner job hang detector
deansheather Jun 9, 2023
dfaf836
Merge branch 'main' into dean/hang-detector
deansheather Jun 9, 2023
530e8f2
chore: ensure provisioner kills upon failed update
deansheather Jun 9, 2023
027443a
Merge branch 'main' into dean/hang-detector
deansheather Jun 13, 2023
0218151
fix cancel timeout test
deansheather Jun 13, 2023
9e0ae3b
fixup! fix cancel timeout test
deansheather Jun 13, 2023
590f76a
comments
deansheather Jun 20, 2023
6f1e127
Merge branch 'main' into dean/hang-detector
deansheather Jun 20, 2023
e284b47
small refactor
deansheather Jun 21, 2023
0b9e78a
tx per unhang job
deansheather Jun 21, 2023
8f16c3b
Merge branch 'main' into dean/hang-detector
deansheather Jun 21, 2023
f25938a
fixup! Merge branch 'main' into dean/hang-detector
deansheather Jun 21, 2023
aa36a0d
Merge branch 'main' into dean/hang-detector
deansheather Jun 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
Prev Previous commit
Next Next commit
Merge branch 'main' into dean/hang-detector
  • Loading branch information
@deansheather
deansheather committed Jun 20, 2023
commit 6f1e1278a201872889fc667c9bc51425127609ee
15 changes: 11 additions & 4 deletions .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,12 +188,19 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v3

- uses: buildjet/setup-node@v3
with:
fetch-depth: 0
submodules: true
node-version: 16.16.0

- uses: ./.github/actions/setup-node
- uses: ./.github/actions/setup-go
- uses: buildjet/setup-go@v4
with:
# This doesn't need caching. It's super fast anyways!
cache: false
go-version: 1.20.5

- name: Install prettier
run: npm install -g prettier

- name: Install shfmt
run: go install mvdan.cc/sh/v3/cmd/shfmt@v3.5.0
Expand Down
8 changes: 1 addition & 7 deletions .vscode/settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,11 +212,5 @@
// We often use a version of TypeScript that's ahead of the version shipped
// with VS Code.
"typescript.tsdk": "./site/node_modules/typescript/lib",
"grammarly.selectors": [
{
"language": "markdown",
"scheme": "file",
"pattern": "docs/contributing/frontend.md"
}
]
"prettier.prettierPath": "./node_modules/prettier"
}
10 changes: 5 additions & 5 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,9 @@ endif
FIND_EXCLUSIONS= \
-not \( \( -path '*/.git/*' -o -path './build/*' -o -path './vendor/*' -o -path './.coderv2/*' -o -path '*/node_modules/*' -o -path './site/out/*' -o -path './coderd/apidoc/*' \) -prune \)
# Source files used for make targets, evaluated on use.
GO_SRC_FILES = $(shell find . $(FIND_EXCLUSIONS) -type f -name '*.go')
GO_SRC_FILES := $(shell find . $(FIND_EXCLUSIONS) -type f -name '*.go')
# All the shell files in the repo, excluding ignored files.
SHELL_SRC_FILES = $(shell find . $(FIND_EXCLUSIONS) -type f -name '*.sh')
SHELL_SRC_FILES := $(shell find . $(FIND_EXCLUSIONS) -type f -name '*.sh')

# All ${OS}_${ARCH} combos we build for. Windows binaries have the .exe suffix.
OS_ARCHES := \
Expand Down Expand Up @@ -431,7 +431,7 @@ lint/helm:
gen: \
coderd/database/dump.sql \
coderd/database/querier.go \
coderd/database/dbmock/store.go \
coderd/database/dbmock/dbmock.go \
provisionersdk/proto/provisioner.pb.go \
provisionerd/proto/provisionerd.pb.go \
site/src/api/typesGenerated.ts \
Expand All @@ -453,7 +453,7 @@ gen/mark-fresh:
files="\
coderd/database/dump.sql \
coderd/database/querier.go \
coderd/database/dbmock/store.go \
coderd/database/dbmock/dbmock.go \
provisionersdk/proto/provisioner.pb.go \
provisionerd/proto/provisionerd.pb.go \
site/src/api/typesGenerated.ts \
Expand Down Expand Up @@ -490,7 +490,7 @@ coderd/database/querier.go: coderd/database/sqlc.yaml coderd/database/dump.sql $
./coderd/database/generate.sh


coderd/database/dbmock/store.go: coderd/database/db.go coderd/database/querier.go
coderd/database/dbmock/dbmock.go: coderd/database/db.go coderd/database/querier.go
go generate ./coderd/database/dbmock/

provisionersdk/proto/provisioner.pb.go: provisionersdk/proto/provisioner.proto
Expand Down
Loading
You are viewing a condensed version of this merge commit. You can view the full changes here.