More log_tags to make explicit the devices state

This commit is contained in:
Andrea Mazzoleni 2025-12-18 12:10:20 +01:00
parent 352e641e84
commit 30e329d4f3
6 changed files with 302 additions and 72 deletions

View file

@ -710,7 +710,7 @@ static void windows_errno(DWORD error)
errno = EIO;
break;
default :
log_fatal("Unexpected Windows error %d.\n", (int)error);
log_fatal("Unexpected Windows error %lu.\n", error);
errno = EIO;
break;
}
@ -2526,6 +2526,7 @@ retry:
f = _wpopen(cmd, L"rt");
if (!f) {
/* LCOV_EXCL_START */
log_tag("device:%s:%s:shell\n", file, name);
log_fatal("Failed to run '%s' (from popen).\n", u16tou8(conv_buf, cmd));
return -1;
/* LCOV_EXCL_STOP */
@ -2534,6 +2535,7 @@ retry:
if (smartctl_attribute(f, file, name, smart, serial, vendor, model) != 0) {
/* LCOV_EXCL_START */
pclose(f);
log_tag("device:%s:%s:shell\n", file, name);
return -1;
/* LCOV_EXCL_STOP */
}
@ -2544,6 +2546,7 @@ retry:
if (ret == -1) {
/* LCOV_EXCL_START */
log_tag("device:%s:%s:shell\n", file, name);
log_fatal("Failed to run '%s' (from pclose).\n", u16tou8(conv_buf, cmd));
return -1;
/* LCOV_EXCL_STOP */
@ -2612,6 +2615,7 @@ retry:
f = _wpopen(cmd, L"rt");
if (!f) {
/* LCOV_EXCL_START */
log_tag("device:%s:%s:shell\n", file, name);
log_fatal("Failed to run '%s' (from popen).\n", u16tou8(conv_buf, cmd));
return -1;
/* LCOV_EXCL_STOP */
@ -2620,6 +2624,7 @@ retry:
if (smartctl_flush(f, file, name) != 0) {
/* LCOV_EXCL_START */
pclose(f);
log_tag("device:%s:%s:shell\n", file, name);
return -1;
/* LCOV_EXCL_STOP */
}
@ -2630,6 +2635,7 @@ retry:
if (ret == -1) {
/* LCOV_EXCL_START */
log_tag("device:%s:%s:shell\n", file, name);
log_fatal("Failed to run '%s' (from pclose).\n", u16tou8(conv_buf, cmd));
return -1;
/* LCOV_EXCL_STOP */
@ -2654,12 +2660,16 @@ retry:
}
}
if (ret == 0)
if (ret == 0) {
log_tag("device:%s:%s:active\n", file, name);
*power = POWER_ACTIVE;
else if (ret == 3)
} else if (ret == 3) {
log_tag("device:%s:%s:standby\n", file, name);
*power = POWER_STANDBY;
else
} else {
log_tag("device:%s:%s:unknown\n", file, name);
*power = POWER_UNKNOWN;
}
return 0;
}
@ -2695,6 +2705,7 @@ retry:
f = _wpopen(cmd, L"rt");
if (!f) {
/* LCOV_EXCL_START */
log_tag("device:%s:%s:shell\n", file, name);
log_fatal("Failed to run '%s' (from popen).\n", u16tou8(conv_buf, cmd));
return -1;
/* LCOV_EXCL_STOP */
@ -2703,6 +2714,7 @@ retry:
if (smartctl_flush(f, file, name) != 0) {
/* LCOV_EXCL_START */
pclose(f);
log_tag("device:%s:%s:shell\n", file, name);
return -1;
/* LCOV_EXCL_STOP */
}
@ -2713,6 +2725,7 @@ retry:
if (ret == -1) {
/* LCOV_EXCL_START */
log_tag("device:%s:%s:shell\n", file, name);
log_fatal("Failed to run '%s' (from pclose).\n", u16tou8(conv_buf, cmd));
return -1;
/* LCOV_EXCL_STOP */
@ -2739,11 +2752,14 @@ retry:
if (ret != 0) {
/* LCOV_EXCL_START */
log_tag("device:%s:%s:exit:%d\n", file, name, ret);
log_fatal("Failed to run '%s' with return code %xh.\n", u16tou8(conv_buf, cmd), ret);
return -1;
/* LCOV_EXCL_STOP */
}
log_tag("device:%s:%s:down\n", file, name);
return 0;
}
@ -2766,7 +2782,7 @@ static int devdownifup(uint64_t device, const char* name, const char* smartctl,
/**
* Spin up a device.
*/
static int devup(const char* wfile)
static int devup(uint64_t device, const char* name, const char* wfile)
{
wchar_t conv_buf[CONV_MAX];
HANDLE h;
@ -2774,11 +2790,16 @@ static int devup(const char* wfile)
DISK_GEOMETRY dg;
DWORD bytes;
void* buffer;
char file[128];
snprintf(file, sizeof(file), "/dev/pd%" PRIu64, device);
/* open the volume */
h = CreateFileW(convert(conv_buf, wfile), GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, 0, OPEN_EXISTING, FILE_FLAG_NO_BUFFERING | FILE_FLAG_WRITE_THROUGH, 0);
if (h == INVALID_HANDLE_VALUE) {
windows_errno(GetLastError());
DWORD error = GetLastError();
windows_errno(error);
log_tag("device:%s:%s:error:%lu\n", file, name, error);
return -1;
}
@ -2788,6 +2809,7 @@ static int devup(const char* wfile)
DWORD error = GetLastError();
CloseHandle(h);
windows_errno(error);
log_tag("device:%s:%s:error:%lu\n", file, name, error);
return -1;
}
@ -2796,6 +2818,7 @@ static int devup(const char* wfile)
DWORD error = GetLastError();
CloseHandle(h);
windows_errno(error);
log_tag("device:%s:%s:error:%lu\n", file, name, error);
return -1;
}
@ -2804,6 +2827,7 @@ static int devup(const char* wfile)
DWORD error = GetLastError();
CloseHandle(h);
windows_errno(error);
log_tag("device:%s:%s:error:%lu\n", file, name, error);
return -1;
}
@ -2811,11 +2835,14 @@ static int devup(const char* wfile)
DWORD error = GetLastError();
VirtualFree(buffer, 0, MEM_RELEASE);
windows_errno(error);
log_tag("device:%s:%s:error:%lu\n", file, name, error);
return -1;
}
VirtualFree(buffer, 0, MEM_RELEASE);
log_tag("device:%s:%s:up\n", file, name);
return 0;
}
@ -2829,7 +2856,7 @@ static void* thread_spinup(void* arg)
start = tick_ms();
if (devup(devinfo->wfile) != 0) {
if (devup(devinfo->device, devinfo->name, devinfo->wfile) != 0) {
/* LCOV_EXCL_START */
return (void*)-1;
/* LCOV_EXCL_STOP */

View file

@ -2717,6 +2717,14 @@ static void state_read_content(struct snapraid_state* state, const char* path, S
/* LCOV_EXCL_STOP */
}
/* log the info read from the content file */
log_tag("content_disk:%s:%" PRIu64 ":%" PRIu64 ":%u:%s\n",
buffer,
v_total_blocks * (uint64_t)state->block_size,
v_free_blocks * (uint64_t)state->block_size,
v_pos,
uuid);
/* find the disk */
disk = find_disk_by_name(state, buffer);
if (!disk) {
@ -2814,9 +2822,13 @@ static void state_read_content(struct snapraid_state* state, const char* path, S
state->parity[v_level].free_blocks = v_free_blocks;
/* log the info read from the content file */
log_tag("content:%s:0:%s:%s:%" PRIi64 "\n", lev_config_name(v_level),
state->parity[v_level].split_map[0].path,
log_tag("content_parity:%s:%" PRIu64 ":%" PRIu64 ":%u:%s:%s:%" PRIi64 "\n",
lev_config_name(v_level),
v_total_blocks * (uint64_t)state->block_size,
v_free_blocks * (uint64_t)state->block_size,
0,
state->parity[v_level].split_map[0].uuid,
state->parity[v_level].split_map[0].path,
state->parity[v_level].split_map[0].size);
}
} else if (c == 'Q') {
@ -2937,9 +2949,13 @@ static void state_read_content(struct snapraid_state* state, const char* path, S
state->parity[v_level].split_map[s].size = v_size;
/* log the info read from the content file */
log_tag("content:%s:%u:%s:%s:%" PRIi64 "\n", lev_config_name(v_level), s,
state->parity[v_level].split_map[s].path,
log_tag("content_parity:%s:%" PRIu64 ":%" PRIu64 ":%u:%s:%s:%" PRIi64 "\n",
lev_config_name(v_level),
v_total_blocks * (uint64_t)state->block_size,
v_free_blocks * (uint64_t)state->block_size,
s,
state->parity[v_level].split_map[s].uuid,
state->parity[v_level].split_map[s].path,
state->parity[v_level].split_map[s].size);
}
}

View file

@ -1168,6 +1168,7 @@ static int devsmart(dev_t device, const char* name, const char* smartctl, uint64
f = popen(cmd, "r");
if (!f) {
/* LCOV_EXCL_START */
log_tag("device:%s:%s:shell\n", file, name);
log_fatal("Failed to run '%s' (from popen).\n", cmd);
return -1;
/* LCOV_EXCL_STOP */
@ -1176,6 +1177,7 @@ static int devsmart(dev_t device, const char* name, const char* smartctl, uint64
if (smartctl_attribute(f, file, name, smart, serial, vendor, model) != 0) {
/* LCOV_EXCL_START */
pclose(f);
log_tag("device:%s:%s:shell\n", file, name);
return -1;
/* LCOV_EXCL_STOP */
}
@ -1186,12 +1188,14 @@ static int devsmart(dev_t device, const char* name, const char* smartctl, uint64
if (!WIFEXITED(ret)) {
/* LCOV_EXCL_START */
log_tag("device:%s:%s:error:abort\n", file, name);
log_fatal("Failed to run '%s' (not exited).\n", cmd);
return -1;
/* LCOV_EXCL_STOP */
}
if (WEXITSTATUS(ret) == 127) {
/* LCOV_EXCL_START */
log_tag("device:%s:%s:shell\n", file, name);
log_fatal("Failed to run '%s' (from sh).\n", cmd);
return -1;
/* LCOV_EXCL_STOP */
@ -1236,6 +1240,7 @@ static int devprobe(dev_t device, const char* name, const char* smartctl, int* p
f = popen(cmd, "r");
if (!f) {
/* LCOV_EXCL_START */
log_tag("device:%s:%s:shell\n", file, name);
log_fatal("Failed to run '%s' (from popen).\n", cmd);
return -1;
/* LCOV_EXCL_STOP */
@ -1244,6 +1249,7 @@ static int devprobe(dev_t device, const char* name, const char* smartctl, int* p
if (smartctl_flush(f, file, name) != 0) {
/* LCOV_EXCL_START */
pclose(f);
log_tag("device:%s:%s:shell\n", file, name);
return -1;
/* LCOV_EXCL_STOP */
}
@ -1254,22 +1260,27 @@ static int devprobe(dev_t device, const char* name, const char* smartctl, int* p
if (!WIFEXITED(ret)) {
/* LCOV_EXCL_START */
log_tag("device:%s:%s:abort\n", file, name);
log_fatal("Failed to run '%s' (not exited).\n", cmd);
return -1;
/* LCOV_EXCL_STOP */
}
if (WEXITSTATUS(ret) == 127) {
/* LCOV_EXCL_START */
log_tag("device:%s:%s:shell\n", file, name);
log_fatal("Failed to run '%s' (from sh).\n", cmd);
return -1;
/* LCOV_EXCL_STOP */
}
if (WEXITSTATUS(ret) == 0) {
log_tag("device:%s:%s:active\n", file, name);
*power = POWER_ACTIVE;
} else if (WEXITSTATUS(ret) == 3) {
log_tag("device:%s:%s:standby\n", file, name);
*power = POWER_STANDBY;
} else {
/* LCOV_EXCL_START */
log_tag("device:%s:%s:exit:%d\n", file, name, WEXITSTATUS(ret));
log_fatal("Failed to run '%s' with return code %xh.\n", cmd, WEXITSTATUS(ret));
return -1;
/* LCOV_EXCL_STOP */
@ -1311,6 +1322,7 @@ static int devdown(dev_t device, const char* name, const char* smartctl)
f = popen(cmd, "r");
if (!f) {
/* LCOV_EXCL_START */
log_tag("device:%s:%s:shell\n", file, name);
log_fatal("Failed to run '%s' (from popen).\n", cmd);
return -1;
/* LCOV_EXCL_STOP */
@ -1319,6 +1331,7 @@ static int devdown(dev_t device, const char* name, const char* smartctl)
if (smartctl_flush(f, file, name) != 0) {
/* LCOV_EXCL_START */
pclose(f);
log_tag("device:%s:%s:shell\n", file, name);
return -1;
/* LCOV_EXCL_STOP */
}
@ -1329,23 +1342,28 @@ static int devdown(dev_t device, const char* name, const char* smartctl)
if (!WIFEXITED(ret)) {
/* LCOV_EXCL_START */
log_tag("device:%s:%s:abort\n", file, name);
log_fatal("Failed to run '%s' (not exited).\n", cmd);
return -1;
/* LCOV_EXCL_STOP */
}
if (WEXITSTATUS(ret) == 127) {
/* LCOV_EXCL_START */
log_tag("device:%s:%s:shell\n", file, name);
log_fatal("Failed to run '%s' (from sh).\n", cmd);
return -1;
/* LCOV_EXCL_STOP */
}
if (WEXITSTATUS(ret) != 0) {
/* LCOV_EXCL_START */
log_tag("device:%s:%s:exit:%d\n", file, name, WEXITSTATUS(ret));
log_fatal("Failed to run '%s' with return code %xh.\n", cmd, WEXITSTATUS(ret));
return -1;
/* LCOV_EXCL_STOP */
}
log_tag("device:%s:%s:down\n", file, name);
return 0;
}
#endif
@ -1372,7 +1390,7 @@ static int devdownifup(dev_t device, const char* name, const char* smartctl, int
* Spin up a specific device.
*/
#if HAVE_LINUX_DEVICE
static int devup(dev_t device)
static int devup(dev_t device, const char* name)
{
char file[PATH_MAX];
int ret;
@ -1398,6 +1416,7 @@ static int devup(dev_t device)
if (f < 0) {
/* LCOV_EXCL_START */
free(buf);
log_tag("device:%s:%s:error:%d\n", file, name, errno);
log_fatal("Failed to open device '%u:%u'.\n", major(device), minor(device));
return -1;
/* LCOV_EXCL_STOP */
@ -1408,6 +1427,7 @@ static int devup(dev_t device)
/* LCOV_EXCL_START */
close(f);
free(buf);
log_tag("device:%s:%s:error:%d\n", file, name, errno);
log_fatal("Failed to read device '%u:%u'.\n", major(device), minor(device));
return -1;
/* LCOV_EXCL_STOP */
@ -1417,11 +1437,14 @@ static int devup(dev_t device)
if (ret < 0) {
/* LCOV_EXCL_START */
free(buf);
log_tag("device:%s:%s:error:%d\n", file, name, errno);
log_fatal("Failed to close device '%u:%u'.\n", major(device), minor(device));
return -1;
/* LCOV_EXCL_STOP */
}
log_tag("device:%s:%s:up\n", file, name);
free(buf);
return 0;
}
@ -1442,7 +1465,7 @@ static void* thread_spinup(void* arg)
start = tick_ms();
if (devup(devinfo->device) != 0) {
if (devup(devinfo->device, devinfo->name) != 0) {
/* LCOV_EXCL_START */
return (void*)-1;
/* LCOV_EXCL_STOP */