-
Notifications
You must be signed in to change notification settings - Fork 22
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[system/process] add support for mutlierr (#166)
## What does this PR do? - Previously, we weren't passing errors to the caller while monitoring set of processes. - With the recent introduction of the status reporter for metricsets, it is impossible to change the status to degraded if such errors are not passed to the caller. - Fix this by passing errors to the caller. We also populate the process related information to our best-effort. ## Checklist - [x] My code follows the style guidelines of this project - [x] I have commented my code, particularly in hard-to-understand areas - [x] I have added tests that prove my fix is effective or that my feature works - [x] I have added an entry in `CHANGELOG.md` <!-- Recommended Link related issues below. Insert the issue link or reference after the word "Closes" if merging this should automatically close it. - Closes #123 - Relates #123 - Requires #123 - Superseds #123 --> - Closes #164 --------- Co-authored-by: Craig MacKenzie <[email protected]>
- Loading branch information
1 parent
a9ecc37
commit 3abd5c0
Showing
11 changed files
with
217 additions
and
35 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,76 @@ | ||
// Licensed to Elasticsearch B.V. under one or more contributor | ||
// license agreements. See the NOTICE file distributed with | ||
// this work for additional information regarding copyright | ||
// ownership. Elasticsearch B.V. licenses this file to you under | ||
// the Apache License, Version 2.0 (the "License"); you may | ||
// not use this file except in compliance with the License. | ||
// You may obtain a copy of the License at | ||
// | ||
// http://www.apache.org/licenses/LICENSE-2.0 | ||
// | ||
// Unless required by applicable law or agreed to in writing, | ||
// software distributed under the License is distributed on an | ||
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
// KIND, either express or implied. See the License for the | ||
// specific language governing permissions and limitations | ||
// under the License. | ||
|
||
package process | ||
|
||
import ( | ||
"errors" | ||
"fmt" | ||
"syscall" | ||
"testing" | ||
|
||
"github.com/stretchr/testify/require" | ||
) | ||
|
||
func TestErrors(t *testing.T) { | ||
cases := []struct { | ||
name string | ||
check func(t *testing.T) | ||
}{ | ||
{ | ||
name: "non fatal error", | ||
check: func(t *testing.T) { | ||
err := fmt.Errorf("Faced non-fatal error: %w", NonFatalErr{Err: syscall.EPERM}) | ||
require.True(t, isNonFatal(err), "Should be a non fatal error") | ||
}, | ||
}, | ||
{ | ||
name: "non fatal error - unwrapped", | ||
check: func(t *testing.T) { | ||
err := fmt.Errorf("Faced non-fatal error: %w", syscall.EPERM) | ||
require.True(t, isNonFatal(err), "Should be a non fatal error") | ||
}, | ||
}, | ||
{ | ||
name: "non fatal error - hierarchy", | ||
check: func(t *testing.T) { | ||
err := fmt.Errorf("Faced non-fatal error: %w", syscall.EPERM) | ||
err2 := errors.Join(toNonFatal(err)) | ||
require.True(t, isNonFatal(err2), "Should be a non fatal error") | ||
}, | ||
}, | ||
{ | ||
name: "fatal error", | ||
check: func(t *testing.T) { | ||
err := fmt.Errorf("Faced fatal error: %w", errors.New("FATAL")) | ||
err = toNonFatal(err) // shouldn't have any effect as it's a fatal error | ||
require.Falsef(t, isNonFatal(err), "Should be a fatal error") | ||
}, | ||
}, | ||
{ | ||
name: "fatal error - hierarchy", | ||
check: func(t *testing.T) { | ||
err := fmt.Errorf("Faced fatal error: %w", errors.New("FATAL")) | ||
err2 := errors.Join(err) | ||
require.Falsef(t, isNonFatal(err2), "Should be a fatal error") | ||
}, | ||
}, | ||
} | ||
for _, c := range cases { | ||
t.Run(c.name, c.check) | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,35 @@ | ||
// Licensed to Elasticsearch B.V. under one or more contributor | ||
// license agreements. See the NOTICE file distributed with | ||
// this work for additional information regarding copyright | ||
// ownership. Elasticsearch B.V. licenses this file to you under | ||
// the Apache License, Version 2.0 (the "License"); you may | ||
// not use this file except in compliance with the License. | ||
// You may obtain a copy of the License at | ||
// | ||
// http://www.apache.org/licenses/LICENSE-2.0 | ||
// | ||
// Unless required by applicable law or agreed to in writing, | ||
// software distributed under the License is distributed on an | ||
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
// KIND, either express or implied. See the License for the | ||
// specific language governing permissions and limitations | ||
// under the License. | ||
|
||
//go:build !windows | ||
|
||
package process | ||
|
||
import ( | ||
"errors" | ||
"syscall" | ||
) | ||
|
||
func isNonFatal(err error) bool { | ||
if err == nil { | ||
return true | ||
} | ||
return (errors.Is(err, syscall.EACCES) || | ||
errors.Is(err, syscall.EPERM) || | ||
errors.Is(err, syscall.EINVAL) || | ||
errors.Is(err, NonFatalErr{})) | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,37 @@ | ||
// Licensed to Elasticsearch B.V. under one or more contributor | ||
// license agreements. See the NOTICE file distributed with | ||
// this work for additional information regarding copyright | ||
// ownership. Elasticsearch B.V. licenses this file to you under | ||
// the Apache License, Version 2.0 (the "License"); you may | ||
// not use this file except in compliance with the License. | ||
// You may obtain a copy of the License at | ||
// | ||
// http://www.apache.org/licenses/LICENSE-2.0 | ||
// | ||
// Unless required by applicable law or agreed to in writing, | ||
// software distributed under the License is distributed on an | ||
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
// KIND, either express or implied. See the License for the | ||
// specific language governing permissions and limitations | ||
// under the License. | ||
|
||
//go:build windows | ||
|
||
package process | ||
|
||
import ( | ||
"errors" | ||
"syscall" | ||
|
||
"golang.org/x/sys/windows" | ||
) | ||
|
||
func isNonFatal(err error) bool { | ||
if err == nil { | ||
return true | ||
} | ||
return errors.Is(err, windows.ERROR_ACCESS_DENIED) || | ||
errors.Is(err, syscall.EPERM) || | ||
errors.Is(err, syscall.EINVAL) || | ||
errors.Is(err, windows.ERROR_INVALID_PARAMETER) || errors.Is(err, NonFatalErr{}) | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.