Compare commits
No commits in common. 'c9' and 'i10c-beta' have entirely different histories.
@ -1 +1 @@
|
||||
9d9b8fcd872d8782b96d312fb13f47a41658dd04 SOURCES/v2.7.0.6.tar.gz
|
||||
b61bd57f3b2f7b048d6bab2739690bbf1d9c213b SOURCES/v2.9.1.1.tar.gz
|
||||
|
||||
@ -1 +1 @@
|
||||
SOURCES/v2.7.0.6.tar.gz
|
||||
SOURCES/v2.9.1.1.tar.gz
|
||||
|
||||
@ -1,75 +0,0 @@
|
||||
From 9d071a9b4b40f0f86bb0b739b72c0b9b4870f060 Mon Sep 17 00:00:00 2001
|
||||
From: Miroslav Rezanina <mrezanin@redhat.com>
|
||||
Date: Fri, 14 May 2021 09:42:08 +0200
|
||||
Subject: Initial redhat build configuation.
|
||||
|
||||
Using .distro repository to hold redhat tools and configuration.
|
||||
|
||||
Package can be built on brew using rh-rhel-koji command.
|
||||
|
||||
Note: Old rh-brew target is supported.
|
||||
|
||||
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
||||
|
||||
Merged patches (2.7.0.6):
|
||||
- 896c5c83 Require iptables package
|
||||
- a702a0d1 (origin/rhel-9.0.0-beta) source-git: Use dynamic SRPM_NAME
|
||||
---
|
||||
.distro/Makefile | 73 ++++++
|
||||
.distro/Makefile.common | 18 ++
|
||||
.distro/WALinuxAgent.spec.template | 254 +++++++++++++++++++++
|
||||
.distro/module-setup.sh | 16 ++
|
||||
.distro/rpmbuild/BUILD/.gitignore | 2 +
|
||||
.distro/rpmbuild/RPMS/.gitignore | 2 +
|
||||
.distro/rpmbuild/SOURCES/.gitignore | 2 +
|
||||
.distro/rpmbuild/SPECS/.gitignore | 2 +
|
||||
.distro/rpmbuild/SRPMS/.gitignore | 2 +
|
||||
.distro/scripts/extract_build_cmd.py | 83 +++++++
|
||||
.distro/scripts/frh.py | 24 ++
|
||||
.distro/scripts/git-backport-diff | 327 +++++++++++++++++++++++++++
|
||||
.distro/scripts/git-compile-check | 215 ++++++++++++++++++
|
||||
.distro/scripts/process-patches.sh | 92 ++++++++
|
||||
.distro/scripts/tarball_checksum.sh | 3 +
|
||||
setup.py | 4 +-
|
||||
16 files changed, 1117 insertions(+), 2 deletions(-)
|
||||
create mode 100644 .distro/Makefile
|
||||
create mode 100644 .distro/Makefile.common
|
||||
create mode 100644 .distro/WALinuxAgent.spec.template
|
||||
create mode 100644 .distro/module-setup.sh
|
||||
create mode 100644 .distro/rpmbuild/BUILD/.gitignore
|
||||
create mode 100644 .distro/rpmbuild/RPMS/.gitignore
|
||||
create mode 100644 .distro/rpmbuild/SOURCES/.gitignore
|
||||
create mode 100644 .distro/rpmbuild/SPECS/.gitignore
|
||||
create mode 100644 .distro/rpmbuild/SRPMS/.gitignore
|
||||
create mode 100755 .distro/scripts/extract_build_cmd.py
|
||||
create mode 100755 .distro/scripts/frh.py
|
||||
create mode 100755 .distro/scripts/git-backport-diff
|
||||
create mode 100755 .distro/scripts/git-compile-check
|
||||
create mode 100755 .distro/scripts/process-patches.sh
|
||||
create mode 100755 .distro/scripts/tarball_checksum.sh
|
||||
|
||||
diff --git a/setup.py b/setup.py
|
||||
index 12c9e1d6..e4d7cf7e 100755
|
||||
--- a/setup.py
|
||||
+++ b/setup.py
|
||||
@@ -97,7 +97,7 @@ def get_data_files(name, version, fullname): # pylint: disable=R0912
|
||||
agent_bin_path = osutil.get_agent_bin_path()
|
||||
|
||||
if name in ('redhat', 'centos', 'almalinux', 'cloudlinux'): # pylint: disable=R1714
|
||||
- if version.startswith("8.2"):
|
||||
+ if version.startswith("9"):
|
||||
# redhat8+ default to py3
|
||||
set_bin_files(data_files, dest=agent_bin_path,
|
||||
src=["bin/py3/waagent", "bin/waagent2.0"])
|
||||
@@ -106,7 +106,7 @@ def get_data_files(name, version, fullname): # pylint: disable=R0912
|
||||
set_conf_files(data_files)
|
||||
set_logrotate_files(data_files)
|
||||
set_udev_files(data_files)
|
||||
- if version.startswith("8.2"):
|
||||
+ if version.startswith("9"):
|
||||
# redhat 8+ uses systemd and python3
|
||||
set_systemd_files(data_files, dest=systemd_dir_path,
|
||||
src=["init/redhat/waagent.service",
|
||||
--
|
||||
2.31.1
|
||||
|
||||
@ -0,0 +1,69 @@
|
||||
From dac5101c56b59dbb14d96d4344d6cb2ac047b392 Mon Sep 17 00:00:00 2001
|
||||
From: Chris Patterson <cpatterson@microsoft.com>
|
||||
Date: Thu, 1 Sep 2022 10:45:47 -0400
|
||||
Subject: [PATCH] waagent.service: set ConditionVirtualization=|microsoft
|
||||
|
||||
Only start waagent service when running under Microsoft virtualization.
|
||||
|
||||
Set it as a triggering condition to make it easier for downstreams or
|
||||
test setups to add another condition (i.e. run outside of hyperv).
|
||||
|
||||
Signed-off-by: Chris Patterson <cpatterson@microsoft.com>
|
||||
---
|
||||
bin/waagent2.0 | 1 +
|
||||
init/redhat/py2/waagent.service | 1 +
|
||||
init/redhat/waagent.service | 1 +
|
||||
init/waagent.service | 1 +
|
||||
4 files changed, 4 insertions(+)
|
||||
|
||||
diff --git a/bin/waagent2.0 b/bin/waagent2.0
|
||||
index 34732677..c84c8c40 100644
|
||||
--- a/bin/waagent2.0
|
||||
+++ b/bin/waagent2.0
|
||||
@@ -1569,6 +1569,7 @@ After=network.target
|
||||
After=sshd.service
|
||||
ConditionFileIsExecutable=/usr/sbin/waagent
|
||||
ConditionPathExists=/etc/waagent.conf
|
||||
+ConditionVirtualization=|microsoft
|
||||
|
||||
[Service]
|
||||
Type=simple
|
||||
diff --git a/init/redhat/py2/waagent.service b/init/redhat/py2/waagent.service
|
||||
index c6d15420..132e7027 100644
|
||||
--- a/init/redhat/py2/waagent.service
|
||||
+++ b/init/redhat/py2/waagent.service
|
||||
@@ -5,6 +5,7 @@ After=network-online.target
|
||||
|
||||
ConditionFileIsExecutable=/usr/sbin/waagent
|
||||
ConditionPathExists=/etc/waagent.conf
|
||||
+ConditionVirtualization=|microsoft
|
||||
|
||||
[Service]
|
||||
Type=simple
|
||||
diff --git a/init/redhat/waagent.service b/init/redhat/waagent.service
|
||||
index dc11fbb1..7c93b101 100644
|
||||
--- a/init/redhat/waagent.service
|
||||
+++ b/init/redhat/waagent.service
|
||||
@@ -5,6 +5,7 @@ After=network-online.target
|
||||
|
||||
ConditionFileIsExecutable=/usr/sbin/waagent
|
||||
ConditionPathExists=/etc/waagent.conf
|
||||
+ConditionVirtualization=|microsoft
|
||||
|
||||
[Service]
|
||||
Type=simple
|
||||
diff --git a/init/waagent.service b/init/waagent.service
|
||||
index e91f1433..aa1f3203 100644
|
||||
--- a/init/waagent.service
|
||||
+++ b/init/waagent.service
|
||||
@@ -5,6 +5,7 @@ After=network-online.target
|
||||
|
||||
ConditionFileIsExecutable=/usr/sbin/waagent
|
||||
ConditionPathExists=/etc/waagent.conf
|
||||
+ConditionVirtualization=|microsoft
|
||||
|
||||
[Service]
|
||||
Type=simple
|
||||
--
|
||||
2.37.3
|
||||
|
||||
@ -1,40 +0,0 @@
|
||||
From 8538516744130409f96b3ec956ff5ec1b1c1be11 Mon Sep 17 00:00:00 2001
|
||||
From: Miroslav Rezanina <mrezanin@redhat.com>
|
||||
Date: Tue, 24 May 2022 04:10:46 -0400
|
||||
Subject: Implement restart_if for RedHat OS
|
||||
|
||||
Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
|
||||
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
||||
---
|
||||
azurelinuxagent/common/osutil/redhat.py | 18 ++++++++++++++++++
|
||||
1 file changed, 18 insertions(+)
|
||||
|
||||
diff --git a/azurelinuxagent/common/osutil/redhat.py b/azurelinuxagent/common/osutil/redhat.py
|
||||
index 9759d113..a02647cd 100644
|
||||
--- a/azurelinuxagent/common/osutil/redhat.py
|
||||
+++ b/azurelinuxagent/common/osutil/redhat.py
|
||||
@@ -142,3 +142,21 @@ class RedhatOSUtil(Redhat6xOSUtil):
|
||||
endpoint = self.get_endpoint_from_leases_path('/var/lib/NetworkManager/dhclient-*.lease')
|
||||
|
||||
return endpoint
|
||||
+
|
||||
+ def restart_if(self, ifname, retries=3, wait=5):
|
||||
+ """
|
||||
+ Restart an interface by bouncing the link.
|
||||
+ """
|
||||
+ retry_limit=retries+1
|
||||
+ for attempt in range(1, retry_limit):
|
||||
+ try:
|
||||
+ shellutil.run_command(["ip", "link", "set", ifname, "down"])
|
||||
+ shellutil.run_command(["ip", "link", "set", ifname, "up"])
|
||||
+
|
||||
+ except shellutil.CommandError as cmd_err:
|
||||
+ logger.warn("failed to restart {0}: return code {1}".format(ifname, cmd_err.returncode))
|
||||
+ if attempt < retry_limit:
|
||||
+ logger.info("retrying in {0} seconds".format(wait))
|
||||
+ time.sleep(wait)
|
||||
+ else:
|
||||
+ logger.warn("exceeded restart retries")
|
||||
--
|
||||
2.31.1
|
||||
|
||||
@ -1 +0,0 @@
|
||||
SUBSYSTEM=="block", ENV{ID_FS_TYPE}=="crypto_LUKS", RUN+="/usr/sbin/tpm2-luks-import.sh /dev/$name"
|
||||
@ -1,18 +0,0 @@
|
||||
#!/usr/bin/bash
|
||||
# SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
check() {
|
||||
return 0
|
||||
}
|
||||
|
||||
depends() {
|
||||
echo tpm2-tss
|
||||
return 0
|
||||
}
|
||||
|
||||
install() {
|
||||
inst_multiple -o \
|
||||
cryptsetup cut mktemp base64 uname hexdump \
|
||||
tpm2_flushcontext tpm2_import tpm2_load tpm2_unseal tpm2_create tpm2_createprimary \
|
||||
/usr/sbin/tpm2-luks-import.sh /lib/udev/rules.d/90-tpm2-import.rules
|
||||
}
|
||||
@ -1,74 +0,0 @@
|
||||
#! /bin/bash -e
|
||||
#
|
||||
# SPDX-License-Identifier: LGPL-2.1-or-later
|
||||
#
|
||||
# This script goes through all 'tpm2-import' tokens and converts them
|
||||
# to 'systemd-tpm2' ones.
|
||||
#
|
||||
|
||||
getval () {
|
||||
grep ^\"$2\" $1 | cut -f 2 -d ':' | sed 's/\"//g'
|
||||
}
|
||||
|
||||
if [[ ! -b "$1" ]]; then
|
||||
echo "Device $1 does not exist!" 1>&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
/usr/sbin/cryptsetup luksDump "$1" | sed -n '/^Tokens:/,/^Digests:/p' | grep ' tpm2-import' | cut -d ':' -f 1 | while read tokenid; do
|
||||
echo "Importing token $tokenid from $1"
|
||||
token=`mktemp`
|
||||
/usr/sbin/cryptsetup token export --token-id "$tokenid" "$1" | sed -e 's/[{}]/''/g' -e 's/\[//g' -e 's/\]//g' -e 's/,\"/\n"/g' > "$token"
|
||||
tempdir=`mktemp -d`
|
||||
pushd "$tempdir" > /dev/null
|
||||
# Save token data to inidividual files to process them with tpm2-tools
|
||||
getval "$token" "parent_pub" | base64 -d > parent.pub
|
||||
getval "$token" "parent_prv" | base64 -d > parent.prv
|
||||
getval "$token" "parent_seed" | base64 -d > parent.seed
|
||||
getval "$token" "seal_pub" | base64 -d > seal.pub
|
||||
getval "$token" "seal_prv" | base64 -d > seal.prv
|
||||
getval "$token" "pcrpolicy_dat" | base64 -d > pcrpolicy.dat
|
||||
if [ ! -z `getval "$token" "unique_dat"` ]; then
|
||||
getval "$token" "unique_dat" | base64 -d > unique.dat
|
||||
fi
|
||||
echo "Unsealing volume key"
|
||||
# Import sealed object
|
||||
tpm2_flushcontext -t
|
||||
if [ ! -f "unique.dat" ]; then
|
||||
tpm2_createprimary -Q -C o -a 'restricted|decrypt|fixedtpm|fixedparent|sensitivedataorigin|userwithauth|noda' -g sha256 -G rsa -c primary.ctx
|
||||
else
|
||||
tpm2_createprimary -Q -C o -a 'restricted|decrypt|fixedtpm|fixedparent|sensitivedataorigin|userwithauth|noda' -g sha256 -G rsa -u unique.dat -c primary.ctx
|
||||
fi
|
||||
tpm2_flushcontext -t
|
||||
tpm2_import -Q -C primary.ctx -u parent.pub -i parent.prv -r parent_imported.prv -s parent.seed
|
||||
tpm2_flushcontext -t
|
||||
tpm2_load -Q -C primary.ctx -u parent.pub -r parent_imported.prv -c parent.ctx
|
||||
tpm2_flushcontext -t
|
||||
tpm2_load -Q -C parent.ctx -u seal.pub -r seal.prv -c seal.ctx
|
||||
tpm2_flushcontext -t
|
||||
tpm2_unseal -Q -c seal.ctx -p pcr:`getval "$token" tpm2-pcr-bank`:`getval "$token" tpm2-pcrs` > volume_key
|
||||
tpm2_flushcontext -t
|
||||
echo "Sealing new volume key"
|
||||
# Create a new sealed object under primary ECC key
|
||||
tpm2_createprimary -Q -C o -g sha256 -G ecc:null:aes128cfb -c primary_ecc.ctx
|
||||
tpm2_flushcontext -t
|
||||
tpm2_create -Q -u seal_local.pub -r seal_local.prv -C primary_ecc.ctx -L pcrpolicy.dat -i volume_key
|
||||
# Create a new systemd-tpm2 compatible token
|
||||
echo "Adding new LUKS token to $1"
|
||||
echo '{"type":"systemd-tpm2","keyslots":["'`getval "$token" keyslots`'"],
|
||||
"tpm2-blob":"'`cat seal_local.prv seal_local.pub | base64 -w0`'",
|
||||
"tpm2-pcrs":['`getval "$token" tpm2-pcrs`'],
|
||||
"tpm2-pcr-bank":"'`getval "$token" tpm2-pcr-bank`'",
|
||||
"tpm2-primary-alg":"ecc",
|
||||
"tpm2-policy-hash":"'`hexdump -ve '1/1 "%.2x"' pcrpolicy.dat`'",
|
||||
"tpm2-pin": false,
|
||||
"kversion": "'`uname -r`'"}' | /usr/sbin/cryptsetup token import "$1"
|
||||
# Remove tpm2-import token now
|
||||
echo "Removing now-unneeded token $tokenid from $1"
|
||||
/usr/sbin/cryptsetup token remove --token-id "$tokenid" "$1"
|
||||
echo "Importing token $tokenid from $1 finished successfully"
|
||||
popd > /dev/null
|
||||
# Cleanup
|
||||
rm -rf "$tempdir"
|
||||
rm -f "$token"
|
||||
done
|
||||
@ -0,0 +1,38 @@
|
||||
From 896d0f1edfbfad20c2eecb04fca17e7dc335dfb8 Mon Sep 17 00:00:00 2001
|
||||
From: Ani Sinha <anisinha@redhat.com>
|
||||
Date: Mon, 6 May 2024 11:50:49 +0530
|
||||
Subject: [PATCH] Disable automatic log collector
|
||||
|
||||
RH-Author: Ani Sinha <anisinha@redhat.com>
|
||||
RH-MergeRequest: 12: Disable automatic log collector
|
||||
RH-Jira: RHEL-35963
|
||||
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
||||
RH-Commit: [1/1] d885b584e6bf7ad7d2169b21bcc12db2b526b651 (anisinha/centos-wa-linux-agent)
|
||||
|
||||
Log collector is enabled by default. Due to security concerns from our customers
|
||||
disable it.
|
||||
|
||||
Jira: https://issues.redhat.com/browse/RHEL-35963
|
||||
Upstream: RHEL only.
|
||||
|
||||
Signed-off-by: Ani Sinha <anisinha@redhat.com>
|
||||
---
|
||||
config/waagent.conf | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/config/waagent.conf b/config/waagent.conf
|
||||
index 7316dc2d..4a345fc0 100644
|
||||
--- a/config/waagent.conf
|
||||
+++ b/config/waagent.conf
|
||||
@@ -70,7 +70,7 @@ Logs.Verbose=n
|
||||
# Logs.Console=y
|
||||
|
||||
# Enable periodic log collection, default is y
|
||||
-Logs.Collect=y
|
||||
+Logs.Collect=n
|
||||
|
||||
# How frequently to collect logs, default is each hour
|
||||
Logs.CollectPeriod=3600
|
||||
--
|
||||
2.39.3
|
||||
|
||||
@ -1,107 +0,0 @@
|
||||
From 1671c696f3b0f51e3e317b50aabc5dc84be4ca01 Mon Sep 17 00:00:00 2001
|
||||
From: Mohammed Gamal <mgamal@redhat.com>
|
||||
Date: Wed, 3 Aug 2022 13:23:19 +0200
|
||||
Subject: [PATCH 2/2] Update Log Collector default in Comments and Readme
|
||||
(#2608)
|
||||
|
||||
RH-Author: Mohamed Gamal Morsy <mmorsy@redhat.com>
|
||||
RH-MergeRequest: 4: Update Log Collector default in Comments and Readme
|
||||
RH-Commit: [1/1] 2f249d80b7136a0e3dbacb34a75c56454b95b8c2
|
||||
RH-Bugzilla: 2093965
|
||||
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
||||
|
||||
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2093965
|
||||
|
||||
(cherry picked from commit a560872bec103523e73ddcb5fb5705896545ffce)
|
||||
|
||||
Signed-off-by: Mohammed Gamal <mgamal@redhat.com>
|
||||
---
|
||||
README.md | 2 +-
|
||||
config/debian/waagent.conf | 2 +-
|
||||
config/suse/waagent.conf | 2 +-
|
||||
config/ubuntu/waagent.conf | 2 +-
|
||||
config/waagent.conf | 2 +-
|
||||
tests/data/test_waagent.conf | 2 +-
|
||||
6 files changed, 6 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/README.md b/README.md
|
||||
index c69f43e6..f2f3db46 100644
|
||||
--- a/README.md
|
||||
+++ b/README.md
|
||||
@@ -465,7 +465,7 @@ _Default: y_
|
||||
|
||||
If set, agent logs will be periodically collected and uploaded to a secure location for improved supportability.
|
||||
|
||||
-NOTE: This feature is only supported ubuntu 16.04+; this flag will not take effect on any other distro.
|
||||
+NOTE: This feature relies on the agent's resource usage features (cgroups); this flag will not take effect on any distro not supported.
|
||||
|
||||
#### __Logs.CollectPeriod__
|
||||
|
||||
diff --git a/config/debian/waagent.conf b/config/debian/waagent.conf
|
||||
index 6bc36604..dfd7afcd 100644
|
||||
--- a/config/debian/waagent.conf
|
||||
+++ b/config/debian/waagent.conf
|
||||
@@ -63,7 +63,7 @@ Logs.Verbose=n
|
||||
# Enable Console logging, default is y
|
||||
# Logs.Console=y
|
||||
|
||||
-# Enable periodic log collection, default is n
|
||||
+# Enable periodic log collection, default is y
|
||||
Logs.Collect=y
|
||||
|
||||
# How frequently to collect logs, default is each hour
|
||||
diff --git a/config/suse/waagent.conf b/config/suse/waagent.conf
|
||||
index ac9f11a2..c617f9af 100644
|
||||
--- a/config/suse/waagent.conf
|
||||
+++ b/config/suse/waagent.conf
|
||||
@@ -66,7 +66,7 @@ Logs.Verbose=n
|
||||
# Enable Console logging, default is y
|
||||
# Logs.Console=y
|
||||
|
||||
-# Enable periodic log collection, default is n
|
||||
+# Enable periodic log collection, default is y
|
||||
Logs.Collect=y
|
||||
|
||||
# How frequently to collect logs, default is each hour
|
||||
diff --git a/config/ubuntu/waagent.conf b/config/ubuntu/waagent.conf
|
||||
index 63635a81..19b56bae 100644
|
||||
--- a/config/ubuntu/waagent.conf
|
||||
+++ b/config/ubuntu/waagent.conf
|
||||
@@ -66,7 +66,7 @@ Logs.Verbose=n
|
||||
# Enable Console logging, default is y
|
||||
# Logs.Console=y
|
||||
|
||||
-# Enable periodic log collection, default is n
|
||||
+# Enable periodic log collection, default is y
|
||||
Logs.Collect=y
|
||||
|
||||
# How frequently to collect logs, default is each hour
|
||||
diff --git a/config/waagent.conf b/config/waagent.conf
|
||||
index c7d10e2f..14cd01c8 100644
|
||||
--- a/config/waagent.conf
|
||||
+++ b/config/waagent.conf
|
||||
@@ -72,7 +72,7 @@ Logs.Verbose=n
|
||||
# Enable Console logging, default is y
|
||||
# Logs.Console=y
|
||||
|
||||
-# Enable periodic log collection, default is n
|
||||
+# Enable periodic log collection, default is y
|
||||
Logs.Collect=y
|
||||
|
||||
# How frequently to collect logs, default is each hour
|
||||
diff --git a/tests/data/test_waagent.conf b/tests/data/test_waagent.conf
|
||||
index a386228a..cc60886e 100644
|
||||
--- a/tests/data/test_waagent.conf
|
||||
+++ b/tests/data/test_waagent.conf
|
||||
@@ -67,7 +67,7 @@ ResourceDisk.MountOptions=None
|
||||
# Enable verbose logging (y|n)
|
||||
Logs.Verbose=n
|
||||
|
||||
-# Enable periodic log collection, default is n
|
||||
+# Enable periodic log collection, default is y
|
||||
Logs.Collect=y
|
||||
|
||||
# How frequently to collect logs, default is each hour
|
||||
--
|
||||
2.31.1
|
||||
|
||||
@ -1,57 +0,0 @@
|
||||
From 6d452b28383c59a8193595daaca13fa8db9338a1 Mon Sep 17 00:00:00 2001
|
||||
From: Mohammed Gamal <mgamal@redhat.com>
|
||||
Date: Wed, 22 Jun 2022 13:36:07 +0200
|
||||
Subject: [PATCH] redhat: Fix command sequence for restarting net interface
|
||||
|
||||
RH-Author: Mohamed Gamal Morsy <mmorsy@redhat.com>
|
||||
RH-MergeRequest: 2: redhat: Fix command sequence for restarting net interface
|
||||
RH-Commit: [1/1] e838ff196b8823f64e08247b3a4dac9d60e5ed72
|
||||
RH-Bugzilla: 2098233
|
||||
RH-Acked-by: Vitaly Kuznetsov <vkuznets@redhat.com>
|
||||
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
||||
|
||||
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2098233
|
||||
|
||||
Apparently the down and up commands need to be run in the same command, so
|
||||
connect them together with "&&" operator. Also re-implement restart_if ot handle
|
||||
warnings same wat as other distros
|
||||
|
||||
Signed-off-by: Mohammed Gamal <mgamal@redhat.com>
|
||||
---
|
||||
azurelinuxagent/common/osutil/redhat.py | 22 ++++++++++------------
|
||||
1 file changed, 10 insertions(+), 12 deletions(-)
|
||||
|
||||
diff --git a/azurelinuxagent/common/osutil/redhat.py b/azurelinuxagent/common/osutil/redhat.py
|
||||
index a02647cd..5c397ae8 100644
|
||||
--- a/azurelinuxagent/common/osutil/redhat.py
|
||||
+++ b/azurelinuxagent/common/osutil/redhat.py
|
||||
@@ -147,16 +147,14 @@ class RedhatOSUtil(Redhat6xOSUtil):
|
||||
"""
|
||||
Restart an interface by bouncing the link.
|
||||
"""
|
||||
- retry_limit=retries+1
|
||||
+ retry_limit = retries + 1
|
||||
for attempt in range(1, retry_limit):
|
||||
- try:
|
||||
- shellutil.run_command(["ip", "link", "set", ifname, "down"])
|
||||
- shellutil.run_command(["ip", "link", "set", ifname, "up"])
|
||||
-
|
||||
- except shellutil.CommandError as cmd_err:
|
||||
- logger.warn("failed to restart {0}: return code {1}".format(ifname, cmd_err.returncode))
|
||||
- if attempt < retry_limit:
|
||||
- logger.info("retrying in {0} seconds".format(wait))
|
||||
- time.sleep(wait)
|
||||
- else:
|
||||
- logger.warn("exceeded restart retries")
|
||||
+ return_code = shellutil.run("ip link set {0} down && ip link set {0} up".format(ifname), expected_errors=[1] if attempt < retries else [])
|
||||
+ if return_code == 0:
|
||||
+ return
|
||||
+ logger.warn("failed to restart {0}: return code {1}".format(ifname, return_code))
|
||||
+ if attempt < retry_limit:
|
||||
+ logger.info("retrying in {0} seconds".format(wait))
|
||||
+ time.sleep(wait)
|
||||
+ else:
|
||||
+ logger.warn("exceeded restart retries")
|
||||
--
|
||||
2.31.1
|
||||
|
||||
@ -0,0 +1,288 @@
|
||||
From 3747dabadea2fe288e6991723e5364179b2906dd Mon Sep 17 00:00:00 2001
|
||||
From: Nageswara Nandigam <84482346+nagworld9@users.noreply.github.com>
|
||||
Date: Mon, 9 Oct 2023 11:14:30 -0700
|
||||
Subject: [PATCH] skip cgorup monitor (#2939)
|
||||
|
||||
RH-Author: Ani Sinha <anisinha@redhat.com>
|
||||
RH-MergeRequest: 14: skip cgorup monitor (#2939)
|
||||
RH-Jira: RHEL-46713
|
||||
RH-Acked-by: Vitaly Kuznetsov <vkuznets@redhat.com>
|
||||
RH-Acked-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
|
||||
RH-Commit: [1/1] 613c87b13204159b6b33214d0cf02ed25bcd67e7 (anisinha/centos-wa-linux-agent)
|
||||
|
||||
(cherry picked from commit 5bad0b4b19c907386b80ec18ad1423cdb7f3a050)
|
||||
Signed-off-by: Ani Sinha <anisinha@redhat.com>
|
||||
|
||||
Conflicts:
|
||||
azurelinuxagent/agent.py
|
||||
azurelinuxagent/common/logcollector.py
|
||||
tests/common/test_logcollector.py
|
||||
All due to libraries being moved around in upstream.
|
||||
---
|
||||
azurelinuxagent/agent.py | 30 +++++++++++++++++++-------
|
||||
azurelinuxagent/common/logcollector.py | 15 +------------
|
||||
azurelinuxagent/ga/collect_logs.py | 10 ++++-----
|
||||
tests/common/test_logcollector.py | 16 +++++++-------
|
||||
tests/test_agent.py | 8 +++----
|
||||
5 files changed, 40 insertions(+), 39 deletions(-)
|
||||
|
||||
diff --git a/azurelinuxagent/agent.py b/azurelinuxagent/agent.py
|
||||
index 8c303482..0fb681e6 100644
|
||||
--- a/azurelinuxagent/agent.py
|
||||
+++ b/azurelinuxagent/agent.py
|
||||
@@ -30,6 +30,7 @@ import sys
|
||||
import threading
|
||||
from azurelinuxagent.common import cgroupconfigurator, logcollector
|
||||
from azurelinuxagent.common.cgroupapi import SystemdCgroupsApi
|
||||
+from azurelinuxagent.common.cgroup import AGENT_LOG_COLLECTOR, CpuCgroup, MemoryCgroup
|
||||
|
||||
import azurelinuxagent.common.conf as conf
|
||||
import azurelinuxagent.common.event as event
|
||||
@@ -204,11 +205,10 @@ class Agent(object):
|
||||
logger.info("Running log collector mode normal")
|
||||
|
||||
# Check the cgroups unit
|
||||
- cpu_cgroup_path, memory_cgroup_path, log_collector_monitor = None, None, None
|
||||
- if CollectLogsHandler.should_validate_cgroups():
|
||||
- cgroups_api = SystemdCgroupsApi()
|
||||
- cpu_cgroup_path, memory_cgroup_path = cgroups_api.get_process_cgroup_paths("self")
|
||||
-
|
||||
+ log_collector_monitor = None
|
||||
+ cgroups_api = SystemdCgroupsApi()
|
||||
+ cpu_cgroup_path, memory_cgroup_path = cgroups_api.get_process_cgroup_paths("self")
|
||||
+ if CollectLogsHandler.is_enabled_monitor_cgroups_check():
|
||||
cpu_slice_matches = (cgroupconfigurator.LOGCOLLECTOR_SLICE in cpu_cgroup_path)
|
||||
memory_slice_matches = (cgroupconfigurator.LOGCOLLECTOR_SLICE in memory_cgroup_path)
|
||||
|
||||
@@ -221,10 +221,24 @@ class Agent(object):
|
||||
|
||||
sys.exit(logcollector.INVALID_CGROUPS_ERRCODE)
|
||||
|
||||
+ def initialize_cgroups_tracking(cpu_cgroup_path, memory_cgroup_path):
|
||||
+ cpu_cgroup = CpuCgroup(AGENT_LOG_COLLECTOR, cpu_cgroup_path)
|
||||
+ msg = "Started tracking cpu cgroup {0}".format(cpu_cgroup)
|
||||
+ logger.info(msg)
|
||||
+ cpu_cgroup.initialize_cpu_usage()
|
||||
+ memory_cgroup = MemoryCgroup(AGENT_LOG_COLLECTOR, memory_cgroup_path)
|
||||
+ msg = "Started tracking memory cgroup {0}".format(memory_cgroup)
|
||||
+ logger.info(msg)
|
||||
+ return [cpu_cgroup, memory_cgroup]
|
||||
+
|
||||
try:
|
||||
- log_collector = LogCollector(is_full_mode, cpu_cgroup_path, memory_cgroup_path)
|
||||
- log_collector_monitor = get_log_collector_monitor_handler(log_collector.cgroups)
|
||||
- log_collector_monitor.run()
|
||||
+ log_collector = LogCollector(is_full_mode)
|
||||
+ # Running log collector resource(CPU, Memory) monitoring only if agent starts the log collector.
|
||||
+ # If Log collector start by any other means, then it will not be monitored.
|
||||
+ if CollectLogsHandler.is_enabled_monitor_cgroups_check():
|
||||
+ tracked_cgroups = initialize_cgroups_tracking(cpu_cgroup_path, memory_cgroup_path)
|
||||
+ log_collector_monitor = get_log_collector_monitor_handler(tracked_cgroups)
|
||||
+ log_collector_monitor.run()
|
||||
archive = log_collector.collect_logs_and_get_archive()
|
||||
logger.info("Log collection successfully completed. Archive can be found at {0} "
|
||||
"and detailed log output can be found at {1}".format(archive, OUTPUT_RESULTS_FILE_PATH))
|
||||
diff --git a/azurelinuxagent/common/logcollector.py b/azurelinuxagent/common/logcollector.py
|
||||
index fe62a7db..5f45a7de 100644
|
||||
--- a/azurelinuxagent/common/logcollector.py
|
||||
+++ b/azurelinuxagent/common/logcollector.py
|
||||
@@ -26,7 +26,6 @@ import zipfile
|
||||
from datetime import datetime
|
||||
from heapq import heappush, heappop
|
||||
|
||||
-from azurelinuxagent.common.cgroup import CpuCgroup, AGENT_LOG_COLLECTOR, MemoryCgroup
|
||||
from azurelinuxagent.common.conf import get_lib_dir, get_ext_log_dir, get_agent_log_file
|
||||
from azurelinuxagent.common.event import initialize_event_logger_vminfo_common_parameters
|
||||
from azurelinuxagent.common.future import ustr
|
||||
@@ -71,14 +70,13 @@ class LogCollector(object):
|
||||
|
||||
_TRUNCATED_FILE_PREFIX = "truncated_"
|
||||
|
||||
- def __init__(self, is_full_mode=False, cpu_cgroup_path=None, memory_cgroup_path=None):
|
||||
+ def __init__(self, is_full_mode=False):
|
||||
self._is_full_mode = is_full_mode
|
||||
self._manifest = MANIFEST_FULL if is_full_mode else MANIFEST_NORMAL
|
||||
self._must_collect_files = self._expand_must_collect_files()
|
||||
self._create_base_dirs()
|
||||
self._set_logger()
|
||||
self._initialize_telemetry()
|
||||
- self.cgroups = self._set_resource_usage_cgroups(cpu_cgroup_path, memory_cgroup_path)
|
||||
|
||||
@staticmethod
|
||||
def _mkdir(dirname):
|
||||
@@ -105,17 +103,6 @@ class LogCollector(object):
|
||||
_LOGGER.addHandler(_f_handler)
|
||||
_LOGGER.setLevel(logging.INFO)
|
||||
|
||||
- @staticmethod
|
||||
- def _set_resource_usage_cgroups(cpu_cgroup_path, memory_cgroup_path):
|
||||
- cpu_cgroup = CpuCgroup(AGENT_LOG_COLLECTOR, cpu_cgroup_path)
|
||||
- msg = "Started tracking cpu cgroup {0}".format(cpu_cgroup)
|
||||
- _LOGGER.info(msg)
|
||||
- cpu_cgroup.initialize_cpu_usage()
|
||||
- memory_cgroup = MemoryCgroup(AGENT_LOG_COLLECTOR, memory_cgroup_path)
|
||||
- msg = "Started tracking memory cgroup {0}".format(memory_cgroup)
|
||||
- _LOGGER.info(msg)
|
||||
- return [cpu_cgroup, memory_cgroup]
|
||||
-
|
||||
@staticmethod
|
||||
def _initialize_telemetry():
|
||||
protocol = get_protocol_util().get_protocol(init_goal_state=False)
|
||||
diff --git a/azurelinuxagent/ga/collect_logs.py b/azurelinuxagent/ga/collect_logs.py
|
||||
index 95c42f3a..4f42e149 100644
|
||||
--- a/azurelinuxagent/ga/collect_logs.py
|
||||
+++ b/azurelinuxagent/ga/collect_logs.py
|
||||
@@ -83,16 +83,16 @@ class CollectLogsHandler(ThreadHandlerInterface):
|
||||
return CollectLogsHandler._THREAD_NAME
|
||||
|
||||
@staticmethod
|
||||
- def enable_cgroups_validation():
|
||||
+ def enable_monitor_cgroups_check():
|
||||
os.environ[CollectLogsHandler.__CGROUPS_FLAG_ENV_VARIABLE] = "1"
|
||||
|
||||
@staticmethod
|
||||
- def disable_cgroups_validation():
|
||||
+ def disable_monitor_cgroups_check():
|
||||
if CollectLogsHandler.__CGROUPS_FLAG_ENV_VARIABLE in os.environ:
|
||||
del os.environ[CollectLogsHandler.__CGROUPS_FLAG_ENV_VARIABLE]
|
||||
|
||||
@staticmethod
|
||||
- def should_validate_cgroups():
|
||||
+ def is_enabled_monitor_cgroups_check():
|
||||
if CollectLogsHandler.__CGROUPS_FLAG_ENV_VARIABLE in os.environ:
|
||||
return os.environ[CollectLogsHandler.__CGROUPS_FLAG_ENV_VARIABLE] == "1"
|
||||
return False
|
||||
@@ -147,7 +147,7 @@ class CollectLogsHandler(ThreadHandlerInterface):
|
||||
time.sleep(_INITIAL_LOG_COLLECTION_DELAY)
|
||||
|
||||
try:
|
||||
- CollectLogsHandler.enable_cgroups_validation()
|
||||
+ CollectLogsHandler.enable_monitor_cgroups_check()
|
||||
if self.protocol_util is None or self.protocol is None:
|
||||
self.init_protocols()
|
||||
|
||||
@@ -162,7 +162,7 @@ class CollectLogsHandler(ThreadHandlerInterface):
|
||||
except Exception as e:
|
||||
logger.error("An error occurred in the log collection thread; will exit the thread.\n{0}", ustr(e))
|
||||
finally:
|
||||
- CollectLogsHandler.disable_cgroups_validation()
|
||||
+ CollectLogsHandler.disable_monitor_cgroups_check()
|
||||
|
||||
def collect_and_send_logs(self):
|
||||
if self._collect_logs():
|
||||
diff --git a/tests/common/test_logcollector.py b/tests/common/test_logcollector.py
|
||||
index 521e0f23..bf402cc7 100644
|
||||
--- a/tests/common/test_logcollector.py
|
||||
+++ b/tests/common/test_logcollector.py
|
||||
@@ -212,7 +212,7 @@ diskinfo,""".format(folder_to_list, file_to_collect)
|
||||
|
||||
with patch("azurelinuxagent.common.logcollector.MANIFEST_NORMAL", manifest):
|
||||
with patch('azurelinuxagent.common.logcollector.LogCollector._initialize_telemetry'):
|
||||
- log_collector = LogCollector(cpu_cgroup_path="dummy_cpu_path", memory_cgroup_path="dummy_memory_path")
|
||||
+ log_collector = LogCollector()
|
||||
archive = log_collector.collect_logs_and_get_archive()
|
||||
|
||||
with open(self.output_results_file_path, "r") as fh:
|
||||
@@ -241,7 +241,7 @@ copy,{0}
|
||||
|
||||
with patch("azurelinuxagent.common.logcollector.MANIFEST_FULL", manifest):
|
||||
with patch('azurelinuxagent.common.logcollector.LogCollector._initialize_telemetry'):
|
||||
- log_collector = LogCollector(is_full_mode=True, cpu_cgroup_path="dummy_cpu_path", memory_cgroup_path="dummy_memory_path")
|
||||
+ log_collector = LogCollector(is_full_mode=True)
|
||||
archive = log_collector.collect_logs_and_get_archive()
|
||||
|
||||
self._assert_archive_created(archive)
|
||||
@@ -255,7 +255,7 @@ copy,{0}
|
||||
# and combined they do not cross the archive size threshold.
|
||||
|
||||
with patch('azurelinuxagent.common.logcollector.LogCollector._initialize_telemetry'):
|
||||
- log_collector = LogCollector(cpu_cgroup_path="dummy_cpu_path", memory_cgroup_path="dummy_memory_path")
|
||||
+ log_collector = LogCollector()
|
||||
archive = log_collector.collect_logs_and_get_archive()
|
||||
|
||||
self._assert_archive_created(archive)
|
||||
@@ -277,7 +277,7 @@ copy,{0}
|
||||
# Set the size limit so that some files are too large to collect in full.
|
||||
with patch("azurelinuxagent.common.logcollector._FILE_SIZE_LIMIT", SMALL_FILE_SIZE):
|
||||
with patch('azurelinuxagent.common.logcollector.LogCollector._initialize_telemetry'):
|
||||
- log_collector = LogCollector(cpu_cgroup_path="dummy_cpu_path", memory_cgroup_path="dummy_memory_path")
|
||||
+ log_collector = LogCollector()
|
||||
archive = log_collector.collect_logs_and_get_archive()
|
||||
|
||||
self._assert_archive_created(archive)
|
||||
@@ -311,7 +311,7 @@ copy,{0}
|
||||
with patch("azurelinuxagent.common.logcollector._UNCOMPRESSED_ARCHIVE_SIZE_LIMIT", 10 * 1024 * 1024):
|
||||
with patch("azurelinuxagent.common.logcollector._MUST_COLLECT_FILES", must_collect_files):
|
||||
with patch('azurelinuxagent.common.logcollector.LogCollector._initialize_telemetry'):
|
||||
- log_collector = LogCollector(cpu_cgroup_path="dummy_cpu_path", memory_cgroup_path="dummy_memory_path")
|
||||
+ log_collector = LogCollector()
|
||||
archive = log_collector.collect_logs_and_get_archive()
|
||||
|
||||
self._assert_archive_created(archive)
|
||||
@@ -362,7 +362,7 @@ copy,{0}
|
||||
# Ensure the archive reflects the state of files on the disk at collection time. If a file was updated, it
|
||||
# needs to be updated in the archive, deleted if removed from disk, and added if not previously seen.
|
||||
with patch('azurelinuxagent.common.logcollector.LogCollector._initialize_telemetry'):
|
||||
- log_collector = LogCollector(cpu_cgroup_path="dummy_cpu_path", memory_cgroup_path="dummy_memory_path")
|
||||
+ log_collector = LogCollector()
|
||||
first_archive = log_collector.collect_logs_and_get_archive()
|
||||
self._assert_archive_created(first_archive)
|
||||
|
||||
@@ -433,7 +433,7 @@ copy,{0}
|
||||
with patch("azurelinuxagent.common.logcollector._MUST_COLLECT_FILES", must_collect_files):
|
||||
with patch("azurelinuxagent.common.logcollector._FILE_SIZE_LIMIT", SMALL_FILE_SIZE):
|
||||
with patch('azurelinuxagent.common.logcollector.LogCollector._initialize_telemetry'):
|
||||
- log_collector = LogCollector(cpu_cgroup_path="dummy_cpu_path", memory_cgroup_path="dummy_memory_path")
|
||||
+ log_collector = LogCollector()
|
||||
archive = log_collector.collect_logs_and_get_archive()
|
||||
|
||||
self._assert_archive_created(archive)
|
||||
@@ -455,7 +455,7 @@ copy,{0}
|
||||
with patch("azurelinuxagent.common.logcollector._MUST_COLLECT_FILES", must_collect_files):
|
||||
with patch("azurelinuxagent.common.logcollector._FILE_SIZE_LIMIT", SMALL_FILE_SIZE):
|
||||
with patch('azurelinuxagent.common.logcollector.LogCollector._initialize_telemetry'):
|
||||
- log_collector = LogCollector(cpu_cgroup_path="dummy_cpu_path", memory_cgroup_path="dummy_memory_path")
|
||||
+ log_collector = LogCollector()
|
||||
second_archive = log_collector.collect_logs_and_get_archive()
|
||||
|
||||
expected_files = [
|
||||
diff --git a/tests/test_agent.py b/tests/test_agent.py
|
||||
index f0f773f0..f5e87c87 100644
|
||||
--- a/tests/test_agent.py
|
||||
+++ b/tests/test_agent.py
|
||||
@@ -231,7 +231,7 @@ class TestAgent(AgentTestCase):
|
||||
@patch("azurelinuxagent.agent.LogCollector")
|
||||
def test_calls_collect_logs_on_valid_cgroups(self, mock_log_collector):
|
||||
try:
|
||||
- CollectLogsHandler.enable_cgroups_validation()
|
||||
+ CollectLogsHandler.enable_monitor_cgroups_check()
|
||||
mock_log_collector.run = Mock()
|
||||
|
||||
def mock_cgroup_paths(*args, **kwargs):
|
||||
@@ -246,12 +246,12 @@ class TestAgent(AgentTestCase):
|
||||
|
||||
mock_log_collector.assert_called_once()
|
||||
finally:
|
||||
- CollectLogsHandler.disable_cgroups_validation()
|
||||
+ CollectLogsHandler.disable_monitor_cgroups_check()
|
||||
|
||||
@patch("azurelinuxagent.agent.LogCollector")
|
||||
def test_doesnt_call_collect_logs_on_invalid_cgroups(self, mock_log_collector):
|
||||
try:
|
||||
- CollectLogsHandler.enable_cgroups_validation()
|
||||
+ CollectLogsHandler.enable_monitor_cgroups_check()
|
||||
mock_log_collector.run = Mock()
|
||||
|
||||
def mock_cgroup_paths(*args, **kwargs):
|
||||
@@ -270,7 +270,7 @@ class TestAgent(AgentTestCase):
|
||||
mock_exit.assert_called_once_with(logcollector.INVALID_CGROUPS_ERRCODE)
|
||||
self.assertEqual(exit_error, re)
|
||||
finally:
|
||||
- CollectLogsHandler.disable_cgroups_validation()
|
||||
+ CollectLogsHandler.disable_monitor_cgroups_check()
|
||||
|
||||
def test_it_should_parse_setup_firewall_properly(self):
|
||||
|
||||
--
|
||||
2.39.3
|
||||
|
||||
Loading…
Reference in new issue