File tree Expand file tree Collapse file tree 1 file changed +6
-2
lines changed
components/ws-daemon/pkg/daemon Expand file tree Collapse file tree 1 file changed +6
-2
lines changed Original file line number Diff line number Diff line change @@ -139,11 +139,15 @@ func unmountMark(instanceID string) error {
139
139
path := fromPartialMount (filepath .Join (dir , "mark" ), mounts )
140
140
// empty path means no mount found
141
141
if len (path ) == 0 {
142
+ log .WithFields (log .OWI ("" , "" , instanceID )).Info ("no mount found" )
142
143
return nil
143
144
}
144
145
145
146
// in some scenarios we need to wait for the unmount
146
- var errorFn = func (err error ) bool {
147
+ var canRetryFn = func (err error ) bool {
148
+ if ! strings .Contains (err .Error (), "device or resource busy" ) {
149
+ log .WithError (err ).WithFields (log .OWI ("" , "" , instanceID )).Info ("Will not retry unmount mark" )
150
+ }
147
151
return strings .Contains (err .Error (), "device or resource busy" )
148
152
}
149
153
@@ -157,7 +161,7 @@ func unmountMark(instanceID string) error {
157
161
Duration : 1 * time .Second ,
158
162
Factor : 5.0 ,
159
163
Jitter : 0.1 ,
160
- }, errorFn , func () error {
164
+ }, canRetryFn , func () error {
161
165
return unix .Unmount (p , 0 )
162
166
})
163
167
})
You can’t perform that action at this time.
0 commit comments