Skip to content

Commit 2a3a5e7

Browse files
author
Mikhail Podtserkovskiy
committed
QA-7710: fix
1 parent d48004e commit 2a3a5e7

File tree

2 files changed

+5
-7
lines changed

2 files changed

+5
-7
lines changed

pool/strategy/kubernetes/provider.go

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -98,12 +98,8 @@ LoopWaitSelenium:
9898
//Destroy - destroy all pod data (idempotent operation)
9999
func (p *kubDnsProvider) Destroy(podName string) error {
100100
err := p.clientset.CoreV1Client.Pods(p.namespace).Delete(podName, &apiV1.DeleteOptions{})
101-
switch {
102-
case err != nil && strings.Contains(err.Error(), "not found"):
103-
// pod already deleted
104-
case err != nil:
105-
err = errors.New("send command pod/delete to k8s, " + err.Error())
106-
return err
101+
if err != nil && !strings.Contains(err.Error(), "not found") {
102+
return errors.New("send command pod/delete to k8s, " + err.Error())
107103
}
108104
return nil
109105
}

pool/strategy/kubernetes/strategy.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ type Strategy struct {
1717
capsComparator capabilities.ComparatorInterface
1818
}
1919

20+
const cleanupFailedPodsTimeout = time.Minute * 2
21+
2022
func (s *Strategy) Reserve(desiredCaps capabilities.Capabilities) (pool.Node, error) {
2123
nodeConfig := s.findApplicableConfig(s.config.NodeList, desiredCaps)
2224
if nodeConfig == nil {
@@ -32,7 +34,7 @@ func (s *Strategy) Reserve(desiredCaps capabilities.Capabilities) (pool.Node, er
3234
nodeAddress, err := s.provider.Create(podName, nodeConfig.Params)
3335
if err != nil {
3436
go func(podName string) {
35-
time.Sleep(time.Minute * 2)
37+
time.Sleep(cleanupFailedPodsTimeout)
3638
_ = s.provider.Destroy(podName) // на случай если что то криво создалось
3739
}(podName)
3840
return pool.Node{}, errors.New("create node by provider, " + err.Error())

0 commit comments

Comments
 (0)