@@ -25,10 +25,10 @@ import (
25
25
"github.com/cockroachdb/cockroach/pkg/ccl/utilccl/licenseccl"
26
26
"github.com/cockroachdb/cockroach/pkg/roachprod/config"
27
27
"github.com/cockroachdb/cockroach/pkg/roachprod/logger"
28
+ "github.com/cockroachdb/cockroach/pkg/roachprod/roachprodutil"
28
29
"github.com/cockroachdb/cockroach/pkg/roachprod/ssh"
29
30
"github.com/cockroachdb/cockroach/pkg/roachprod/vm/gce"
30
31
"github.com/cockroachdb/cockroach/pkg/testutils"
31
- "github.com/cockroachdb/cockroach/pkg/util/debugutil"
32
32
"github.com/cockroachdb/cockroach/pkg/util/retry"
33
33
"github.com/cockroachdb/cockroach/pkg/util/syncutil"
34
34
"github.com/cockroachdb/cockroach/pkg/util/timeutil"
@@ -443,7 +443,7 @@ func (c *SyncedCluster) Start(ctx context.Context, l *logger.Logger, startOpts S
443
443
for _ , hook := range startOpts .PreStartHooks {
444
444
hookCtx , cancel := context .WithTimeout (ctx , hook .Timeout )
445
445
l .Printf ("running pre-start hook: %s" , hook .Name )
446
- err := panicAsError (hookCtx , l , hook .Fn )
446
+ err := roachprodutil . PanicAsError (hookCtx , l , hook .Fn )
447
447
cancel ()
448
448
if err != nil {
449
449
return err
@@ -1703,23 +1703,3 @@ type PreStartHook struct {
1703
1703
Fn func (context.Context ) error
1704
1704
Timeout time.Duration
1705
1705
}
1706
-
1707
- // logPanicToErr logs the panic stack trace and returns an error with the
1708
- // panic message.
1709
- func panicAsError (
1710
- ctx context.Context , l * logger.Logger , f func (context.Context ) error ,
1711
- ) (retErr error ) {
1712
- defer func () {
1713
- if r := recover (); r != nil {
1714
- retErr = logPanicToErr (l , r )
1715
- }
1716
- }()
1717
- return f (ctx )
1718
- }
1719
-
1720
- // logPanicToErr logs the panic stack trace and returns an error with the
1721
- // panic message.
1722
- func logPanicToErr (l * logger.Logger , r interface {}) error {
1723
- l .Printf ("panic stack trace:\n %s" , debugutil .Stack ())
1724
- return fmt .Errorf ("panic (stack trace above): %v" , r )
1725
- }
0 commit comments