Multiple Gitea Doctor improvements #10943

zeripath · 2020-04-03T20:32:13Z

Add gitea doctor --list flag to list the checks that will be run, including those by default
Add gitea doctor --run to run specific checks
Add gitea doctor --all to run all checks
Add db version checker
Add non-default recalculate merge bases check/fixer to doctor
Add hook checker (Fix [Feature] for doctor framewrok #9878) and ensure hooks are executable (Fix "Resynchronize pre-receive, update and post-receive hooks" should explicitly set executable bit #6319)
Fix authorized_keys checker - slight change of functionality here because parsing the command is fragile and we should just check if the authorized_keys file is essentially the same as what gitea would produce. (This is still not perfect as order matters - we should probably just md5sum the two files.)
Add SCRIPT_TYPE check (Fix [Feature] Doctor check if SCRIPT_TYPE is available (default: bash) #10977)
Add gitea doctor --fix to attempt to fix what is possible to easily fix
Add gitea doctor --log-file to set the log-file, be it a file, stdout or to switch off completely. (Fixes previously undetected bug with certain xorm logging configurations - see @6543 comment.)

Signed-off-by: Andrew Thornton art27@cantab.net

Add recalculate merge bases check/fixer to doctor Add functionality for doctor only run certain checks Signed-off-by: Andrew Thornton <art27@cantab.net>

jolheiser

Few questions

cmd/doctor.go

Signed-off-by: Andrew Thornton <art27@cantab.net>

codecov-io · 2020-04-03T22:35:08Z

Codecov Report

Merging #10943 into master will decrease coverage by 0.13%.
The diff coverage is 8.14%.

@@            Coverage Diff             @@
##           master   #10943      +/-   ##
==========================================
- Coverage   43.63%   43.50%   -0.14%     
==========================================
  Files         597      597              
  Lines       83923    84176     +253     
==========================================
  Hits        36619    36619              
- Misses      42794    43041     +247     
- Partials     4510     4516       +6

Impacted Files	Coverage Δ
cmd/doctor.go	`0.00% <0.00%> (ø)`
models/migrations/migrations.go	`3.50% <0.00%> (-0.67%)`	⬇️
modules/repository/hooks.go	`20.45% <23.17%> (-14.94%)`	⬇️
models/ssh_key.go	`50.28% <54.54%> (-0.15%)`	⬇️
modules/indexer/stats/queue.go	`62.50% <0.00%> (-18.75%)`	⬇️
modules/indexer/stats/db.go	`40.62% <0.00%> (-9.38%)`	⬇️
modules/git/utils.go	`65.67% <0.00%> (-4.48%)`	⬇️
services/pull/patch.go	`62.93% <0.00%> (-2.80%)`	⬇️
services/pull/temp_repo.go	`29.05% <0.00%> (-2.57%)`	⬇️
services/pull/check.go	`50.00% <0.00%> (-2.44%)`	⬇️
... and 6 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update f072d45...600517e. Read the comment docs.

cmd/doctor.go

Co-Authored-By: guillep2k <18600385+guillep2k@users.noreply.github.com>

Signed-off-by: Andrew Thornton <art27@cantab.net>

…-base

cmd/doctor.go

modules/repository/hooks.go

models/migrations/migrations.go

Signed-off-by: Andrew Thornton <art27@cantab.net>

6543

check-db panic's

6543 · 2020-04-06T02:34:06Z

[ 2 ] Check Database Version
panic: runtime error: invalid memory address or nil pointer dereference
[signal SIGSEGV: segmentation violation code=0x1 addr=0x0 pc=0x6ca727]

goroutine 1 [running]:
code.gitea.io/gitea/modules/log.(*Logger).Log(0x0, 0x3, 0x2, 0x1da74e9, 0x10, 0xc00134c200, 0x1, 0x1, 0xc00133cf30, 0xc000d8b160)
        /home/6543/git/gitea/modules/log/logger.go:58 +0x37
code.gitea.io/gitea/models.(*XORMLogBridge).Log(...)
        /home/6543/git/gitea/models/log.go:31
code.gitea.io/gitea/models.(*XORMLogBridge).Infof(0xc00134c1d0, 0x1da74e9, 0x10, 0xc00134c200, 0x1, 0x1)
        /home/6543/git/gitea/models/log.go:61 +0x79
xorm.io/xorm/log.(*LoggerAdapter).Infof(0xc00134c1e0, 0x1da74e9, 0x10, 0xc00134c200, 0x1, 0x1)
        /home/6543/git/gitea/vendor/xorm.io/xorm/log/logger_context.go:76 +0x65
xorm.io/xorm.(*Session).Ping(0xc000d8b208, 0x0, 0x0)
        /home/6543/git/gitea/vendor/xorm.io/xorm/session_schema.go:25 +0xfd
xorm.io/xorm.(*Engine).Ping(0xc000247d80, 0x0, 0x0)
        /home/6543/git/gitea/vendor/xorm.io/xorm/engine.go:239 +0xcb
code.gitea.io/gitea/models.NewEngine(0x22416e0, 0xc000040128, 0x1e81340, 0x4e4f37, 0xc000f9a270)
        /home/6543/git/gitea/models/models.go:192 +0x6e
code.gitea.io/gitea/cmd.runDoctorCheckDBVersion(0xc000ff8f20, 0xc000010018, 0xc000d8b798, 0x4, 0x4, 0x1d)
        /home/6543/git/gitea/cmd/doctor.go:338 +0x49
code.gitea.io/gitea/cmd.runDoctor(0xc000ff8f20, 0x0, 0xc000ff8dc0)
        /home/6543/git/gitea/cmd/doctor.go:181 +0x7ae
github.com/urfave/cli.HandleAction(0x19f8280, 0x1e811d8, 0xc000ff8f20, 0xc0004fe800, 0x0)
        /home/6543/git/gitea/vendor/github.com/urfave/cli/app.go:490 +0xc8
github.com/urfave/cli.Command.Run(0x1d0b9da, 0x6, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1db280e, 0x11, 0x0, ...)
        /home/6543/git/gitea/vendor/github.com/urfave/cli/command.go:210 +0x9e8
github.com/urfave/cli.(*App).Run(0xc0005171e0, 0xc00003c180, 0x3, 0x3, 0x0, 0x0)
        /home/6543/git/gitea/vendor/github.com/urfave/cli/app.go:255 +0x741
main.main()
        /home/6543/git/gitea/main.go:109 +0x8a3

zeripath · 2020-04-06T07:20:28Z

@6543 was that in normal running or in a broken gitea case?

Signed-off-by: Andrew Thornton <art27@cantab.net>

…into doctor-update-merge-base

zeripath · 2020-04-06T07:51:20Z

Nevermind I see what the problem is. @6543 I think that was already broken. I have however, fixed the logging situation.

cmd/doctor.go

@6543

Backport go-gitea#10943 * Add `gitea doctor --list` flag to list the checks that will be run, including those by default * Add `gitea doctor --run` to run specific checks * Add `gitea doctor --all` to run all checks * Add db version checker * Add non-default recalculate merge bases check/fixer to doctor * Add hook checker (Fix go-gitea#9878) and ensure hooks are executable (Fix go-gitea#6319) * Fix authorized_keys checker - slight change of functionality here because parsing the command is fragile and we should just check if the authorized_keys file is essentially the same as what gitea would produce. (This is still not perfect as order matters - we should probably just md5sum the two files.) * Add SCRIPT_TYPE check (Fix go-gitea#10977) * Add `gitea doctor --fix` to attempt to fix what is possible to easily fix * Add `gitea doctor --log-file` to set the log-file, be it a file, stdout or to switch off completely. (Fixes previously undetected bug with certain xorm logging configurations - see @6543 comment.) Signed-off-by: Andrew Thornton <art27@cantab.net>

@6543

…#10991) * Mulitple Gitea Doctor improvements (#10943) Backport #10943 * Add `gitea doctor --list` flag to list the checks that will be run, including those by default * Add `gitea doctor --run` to run specific checks * Add `gitea doctor --all` to run all checks * Add db version checker * Add non-default recalculate merge bases check/fixer to doctor * Add hook checker (Fix #9878) and ensure hooks are executable (Fix #6319) * Fix authorized_keys checker - slight change of functionality here because parsing the command is fragile and we should just check if the authorized_keys file is essentially the same as what gitea would produce. (This is still not perfect as order matters - we should probably just md5sum the two files.) * Add SCRIPT_TYPE check (Fix #10977) * Add `gitea doctor --fix` to attempt to fix what is possible to easily fix * Add `gitea doctor --log-file` to set the log-file, be it a file, stdout or to switch off completely. (Fixes previously undetected bug with certain xorm logging configurations - see @6543 comment.) Signed-off-by: Andrew Thornton <art27@cantab.net> * Switch to io.Writer instead of io.StringWriter Signed-off-by: Andrew Thornton <art27@cantab.net>

Add recalculate_merge_bases check to doctor

744774a

Add recalculate merge bases check/fixer to doctor Add functionality for doctor only run certain checks Signed-off-by: Andrew Thornton <art27@cantab.net>

zeripath added type/feature Completely new functionality. Can only be merged if feature freeze is not active. backport/v1.11 labels Apr 3, 2020

zeripath added this to the 1.12.0 milestone Apr 3, 2020

jolheiser reviewed Apr 3, 2020

View reviewed changes

cmd/doctor.go Show resolved Hide resolved

cmd/doctor.go Outdated Show resolved Hide resolved

cmd/doctor.go Outdated Show resolved Hide resolved

GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Apr 3, 2020

Add fix command

67378c5

Signed-off-by: Andrew Thornton <art27@cantab.net>

guillep2k reviewed Apr 4, 2020

View reviewed changes

cmd/doctor.go Outdated Show resolved Hide resolved

cmd/doctor.go Outdated Show resolved Hide resolved

cmd/doctor.go Outdated Show resolved Hide resolved

cmd/doctor.go Outdated Show resolved Hide resolved

cmd/doctor.go Show resolved Hide resolved

zeripath and others added 2 commits April 4, 2020 15:53

Apply suggestions from code review

26caeb7

Co-Authored-By: guillep2k <18600385+guillep2k@users.noreply.github.com>

Add doctor step for checking current version

589c691

Signed-off-by: Andrew Thornton <art27@cantab.net>

zeripath changed the title ~~Add recalculate_merge_bases check to doctor~~ Mulitple Gitea Doctor improvements Apr 5, 2020

zeripath added 4 commits April 5, 2020 11:28

Make gitea doctor authorized_keys check work again

ca34873

Signed-off-by: Andrew Thornton <art27@cantab.net>

Ensure db checker is higher on the list

5c19b9c

Signed-off-by: Andrew Thornton <art27@cantab.net>

Add doctor for hooks and ensure hooks are executable

fe9fc5c

Signed-off-by: Andrew Thornton <art27@cantab.net>

Merge remote-tracking branch 'origin/master' into doctor-update-merge…

adc20b9

…-base

lafriks approved these changes Apr 5, 2020

View reviewed changes

GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Apr 5, 2020

guillep2k reviewed Apr 5, 2020

View reviewed changes

zeripath added 3 commits April 5, 2020 21:03

Fix go-gitea#10977

c869b02

Signed-off-by: Andrew Thornton <art27@cantab.net>

adjust messages as per @guillep2k

c2256dc

Signed-off-by: Andrew Thornton <art27@cantab.net>

as per @guillep2k

600517e

Signed-off-by: Andrew Thornton <art27@cantab.net>

guillep2k approved these changes Apr 5, 2020

View reviewed changes

GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Apr 5, 2020

Merge branch 'master' into doctor-update-merge-base

8737c91

6543 requested changes Apr 6, 2020

View reviewed changes

zeripath added 2 commits April 6, 2020 08:50

And so it continues - now we have logging configuration

060253a

Signed-off-by: Andrew Thornton <art27@cantab.net>

Merge branch 'doctor-update-merge-base' of github.com:zeripath/gitea …

76daf02

…into doctor-update-merge-base

Merge branch 'master' into doctor-update-merge-base

3a2f8dd

zeripath commented Apr 6, 2020

View reviewed changes

cmd/doctor.go Outdated Show resolved Hide resolved

Update cmd/doctor.go

ec83174

6543 approved these changes Apr 6, 2020

View reviewed changes

zeripath merged commit d26885e into go-gitea:master Apr 6, 2020

zeripath deleted the doctor-update-merge-base branch April 6, 2020 10:44

zeripath mentioned this pull request Apr 6, 2020

Multiple Gitea Doctor improvements (#10943) (#10990) (#10064) (#9095) #10991

Merged

zeripath changed the title ~~Mulitple Gitea Doctor improvements~~ Multiple Gitea Doctor improvements May 8, 2020

go-gitea locked and limited conversation to collaborators Nov 24, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Multiple Gitea Doctor improvements #10943

Multiple Gitea Doctor improvements #10943

zeripath commented Apr 3, 2020 •

edited

Loading

jolheiser left a comment

codecov-io commented Apr 3, 2020 •

edited

Loading

6543 left a comment

6543 commented Apr 6, 2020 •

edited

Loading

zeripath commented Apr 6, 2020

zeripath commented Apr 6, 2020

Multiple Gitea Doctor improvements #10943

Multiple Gitea Doctor improvements #10943

Conversation

zeripath commented Apr 3, 2020 • edited Loading

jolheiser left a comment

Choose a reason for hiding this comment

codecov-io commented Apr 3, 2020 • edited Loading

Codecov Report

6543 left a comment

Choose a reason for hiding this comment

6543 commented Apr 6, 2020 • edited Loading

zeripath commented Apr 6, 2020

zeripath commented Apr 6, 2020

zeripath commented Apr 3, 2020 •

edited

Loading

codecov-io commented Apr 3, 2020 •

edited

Loading

6543 commented Apr 6, 2020 •

edited

Loading