xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2026-08-03 16:06:59 +00:00
Code Issues Releases Wiki Activity

Merge pull request #7668 from xcat2/backport-7641-to-2.18

Browse Source 
[Backport 2.18] fix(replaycons): detect confluent by console service, not binary presence
This commit is contained in:
xcat2-backport-automation[bot]
2026-07-23 23:29:27 +00:00
committed by GitHub
parent d657b4f023 8ece83ab36
commit 2d68f4e977
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
xCAT-server/bin/replaycons
+9 -3
View File
@@ -71,9 +71,15 @@ if ($hmtab) {
}
my $file = "/var/log/consoles/$node";
#use confluent if it is there
if ((-x "/opt/confluent/bin/confetty") || (-x "/usr/bin/confetty")) {
$file = "/var/log/confluent/consoles/$node";
#use confluent only when it is the configured console service, not merely
#installed -- otherwise a host with confluent present but conserver active
#would look in the wrong (empty) log directory
my $stab = xCAT::Table->new('site');
if ($stab) {
(my $ref) = $stab->getAttribs({ key => 'consoleservice' }, 'value');
if ($ref->{value} && $ref->{value} eq 'confluent') {
$file = "/var/log/confluent/consoles/$node";
}
}
#print "file=$file\n";