git://git.iain.cx/iain
/
pstop.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Adapt to collect stage information
[pstop.git]
/
p_s
/
setup_instruments
/
setup_instruments.go
diff --git
a/p_s/setup_instruments/setup_instruments.go
b/p_s/setup_instruments/setup_instruments.go
index
c92b6df
..
34c30fe
100644
(file)
--- a/
p_s/setup_instruments/setup_instruments.go
+++ b/
p_s/setup_instruments/setup_instruments.go
@@
-8,7
+8,8
@@
import (
)
// Error 1142: UPDATE command denied to user
)
// Error 1142: UPDATE command denied to user
-const UPDATE_FAILED = "Error 1142"
+// Error 1290: The MySQL server is running with the --read-only option so it cannot execute this statement
+var EXPECTED_UPDATE_ERRORS = []string { "Error 1142", "Error 1290" }
type setup_instruments_row struct {
NAME string
type setup_instruments_row struct {
NAME string
@@
-33,8
+34,6
@@
func (si *SetupInstruments) EnableMutexMonitoring(dbh *sql.DB) {
rows, err := dbh.Query(sql)
if err != nil {
log.Fatal(err)
rows, err := dbh.Query(sql)
if err != nil {
log.Fatal(err)
-
-
}
defer rows.Close()
}
defer rows.Close()
@@
-65,15
+64,24
@@
func (si *SetupInstruments) EnableMutexMonitoring(dbh *sql.DB) {
if _, err := dbh.Exec(sql); err == nil {
si.update_succeeded = true
} else {
if _, err := dbh.Exec(sql); err == nil {
si.update_succeeded = true
} else {
- if err.Error()[0:10] != UPDATE_FAILED {
+ found_expected := false
+ for i := range EXPECTED_UPDATE_ERRORS {
+ if err.Error()[0:10] == EXPECTED_UPDATE_ERRORS[i] {
+ found_expected = true
+ break
+ }
+ }
+ if ! found_expected {
log.Fatal(err)
}
log.Fatal(err)
}
+ lib.Logger.Println( "Insufficient privileges to UPDATE setup_instruments: " + err.Error() )
break
break
-
}
count++
}
}
count++
}
- lib.Logger.Println(count, "rows changed in p_s.setup_instruments")
+ if si.update_succeeded {
+ lib.Logger.Println(count, "rows changed in p_s.setup_instruments")
+ }
}
// restore any changed rows back to their original state
}
// restore any changed rows back to their original state