From 6d56bcd518a20ddb1152a3c287cc0a499fdc02e8 Mon Sep 17 00:00:00 2001 From: Dmitrijs Goloscapovs Date: Mon, 17 Feb 2025 13:03:54 +0200 Subject: [PATCH] .......... [ZBX-25855] added debug --- src/zabbix_agent/logfiles/logfiles.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/zabbix_agent/logfiles/logfiles.c b/src/zabbix_agent/logfiles/logfiles.c index 7eb6787bde8..0bbce858637 100644 --- a/src/zabbix_agent/logfiles/logfiles.c +++ b/src/zabbix_agent/logfiles/logfiles.c @@ -314,6 +314,8 @@ static int file_id(int f, int use_ino, zbx_uint64_t *dev, zbx_uint64_t *ino_lo, BY_HANDLE_FILE_INFORMATION hfi; ZBX_FILE_ID_INFO fid; + zabbix_log(LOG_LEVEL_DEBUG, "%s(), filename: %s", __func__, filename); + if (-1 == (h = _get_osfhandle(f))) { *err_msg = zbx_dsprintf(*err_msg, "Cannot obtain handle from descriptor of file \"%s\": %s", @@ -323,6 +325,7 @@ static int file_id(int f, int use_ino, zbx_uint64_t *dev, zbx_uint64_t *ino_lo, if (1 == use_ino || 0 == use_ino) { + zabbix_log(LOG_LEVEL_DEBUG, "%s(), filename: %s, handling as not refs", __func__, filename); /* Although nFileIndexHigh and nFileIndexLow cannot be reliably used to identify files when */ /* use_ino = 0 (e.g. on FAT32, exFAT), we copy indexes to have at least correct debug logs. */ if (0 != GetFileInformationByHandle((HANDLE)h, &hfi)) @@ -340,11 +343,18 @@ static int file_id(int f, int use_ino, zbx_uint64_t *dev, zbx_uint64_t *ino_lo, } else if (2 == use_ino) { + zabbix_log(LOG_LEVEL_DEBUG, "%s(), filename: %s, handling as refs, using fid", __func__, filename); + if (NULL != zbx_GetFileInformationByHandleEx) { if (0 != zbx_GetFileInformationByHandleEx((HANDLE)h, zbx_FileIdInfo, &fid, sizeof(fid))) { *dev = fid.VolumeSerialNumber; + + zabbix_log(LOG_LEVEL_DEBUG, "%s(), filename: %s, dev: %llu, fileid lowpart: %llu, highpart: %llu", + __func__, filename, + fid.VolumeSerialNumber, fid.FileId.LowPart, fid.FileId.HighPart); + *ino_lo = fid.FileId.LowPart; *ino_hi = fid.FileId.HighPart; } @@ -355,6 +365,11 @@ static int file_id(int f, int use_ino, zbx_uint64_t *dev, zbx_uint64_t *ino_lo, return ret; } } + else + { + zabbix_log(LOG_LEVEL_DEBUG, "%s() zbx_GetFileInformationByHandleEx failed for %s", + __func__, filename); + } } else { -- 2.39.2