Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main' into fix-aws-terraform-t…
Browse files Browse the repository at this point in the history
…ests
  • Loading branch information
bhapas committed Jul 13, 2023
2 parents 934488b + 91bbccf commit 5657bb3
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 14 deletions.
3 changes: 1 addition & 2 deletions CHANGELOG.next.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,8 @@ https://github.com/elastic/beats/compare/v8.8.1\...main[Check the HEAD diff]
- Upgraded apache arrow library used in x-pack/libbeat/reader/parquet from v11 to v12.0.1 in order to fix cross-compilation issues {pull}35640[35640]
- Fix panic when MaxRetryInterval is specified, but RetryInterval is not {pull}35820[35820]
- Do not print context cancelled error message when running under agent {pull}36006[36006]


- Fix recovering from invalid output configuration when running under Elastic-Agent {pull}36016[36016]
- Improve StreamBuf append to improve performance when reading long lines from files. {pull}35928[35928]

*Auditbeat*

Expand Down
22 changes: 11 additions & 11 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -600,15 +600,15 @@ def targetWithoutNode(Map args = [:]) {
// let's support this scenario with the location variable.
dir(isMage ? directory : '') {
// unstash in the same directory where the files were stashed
dir('input/awss3/_meta/terraform'){
echo "terraform-${name}"
try {
unstash(name: "terraform-${name}")
sh "ls -la ${pwd()}"
} catch (error) {
echo "error unstashing: ${error}"
}
}
// dir('input/awss3/_meta/terraform'){
// echo "terraform-${name}"
// try {
// unstash(name: "terraform-${name}")
// sh "ls -la ${pwd()}"
// } catch (error) {
// echo "error unstashing: ${error}"
// }
// }
if (enableRetry) {
// Retry the same command to bypass any kind of flakiness.
// Downside: genuine failures will be repeated.
Expand Down Expand Up @@ -947,9 +947,9 @@ def startCloudTestEnv(Map args = [:]) {
// Archive terraform states in case manual cleanup is needed.
archiveArtifacts(allowEmptyArchive: true, artifacts: '**/terraform.tfstate')
}
dir("x-pack/filebeat/input/awss3/_meta/terraform"){
// dir("x-pack/filebeat/input/awss3/_meta/terraform"){
stash(name: "terraform-${name}", allowEmpty: true, includes: '**/terraform.tfstate,**/.terraform/**,*.yml')
}
// }
}
}
}
Expand Down
4 changes: 3 additions & 1 deletion libbeat/common/streambuf/streambuf.go
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,9 @@ func (b *Buffer) doAppend(data []byte, retainable bool, newCap int) error {
b.data = tmp
}
}
b.data = append(b.data, data...)
tBuf := bytes.NewBuffer(b.data)
tBuf.Write(data)
b.data = tBuf.Bytes()
}
b.available += len(data)

Expand Down

0 comments on commit 5657bb3

Please sign in to comment.