From: Yu Watanabe Date: Tue, 15 Jun 2021 13:07:42 +0000 (+0900) Subject: network: downgrade log level in dhcp4_configure() X-Git-Tag: v250-rc1~856^2~5 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5aebe9c898b3ac242ca875dcea111e485ed19c0d;p=thirdparty%2Fsystemd.git network: downgrade log level in dhcp4_configure() And make the callers warn about failures. --- diff --git a/src/network/networkd-dhcp-common.c b/src/network/networkd-dhcp-common.c index 249d780887e..369dd59e808 100644 --- a/src/network/networkd-dhcp-common.c +++ b/src/network/networkd-dhcp-common.c @@ -107,7 +107,7 @@ static int link_configure_and_start_dhcp_delayed(Link *link) { if (!link->dhcp_client) { r = dhcp4_configure(link); if (r < 0) - return r; + return log_link_warning_errno(link, r, "Failed to configure DHCP4 client: %m"); } if (!link->dhcp6_client) { diff --git a/src/network/networkd-dhcp4.c b/src/network/networkd-dhcp4.c index c986031b87b..135aeace7ec 100644 --- a/src/network/networkd-dhcp4.c +++ b/src/network/networkd-dhcp4.c @@ -1311,7 +1311,7 @@ static int dhcp4_set_hostname(Link *link) { else { r = gethostname_strict(&hostname); if (r < 0 && r != -ENXIO) /* ENXIO: no hostname set or hostname is "localhost" */ - return log_link_warning_errno(link, r, "DHCP4 CLIENT: Failed to get hostname: %m"); + return log_link_debug_errno(link, r, "DHCP4 CLIENT: Failed to get hostname: %m"); hn = hostname; } @@ -1321,7 +1321,7 @@ static int dhcp4_set_hostname(Link *link) { /* Ignore error when the machine's hostname is not suitable to send in DHCP packet. */ log_link_debug_errno(link, r, "DHCP4 CLIENT: Failed to set hostname from kernel hostname, ignoring: %m"); else if (r < 0) - return log_link_warning_errno(link, r, "DHCP4 CLIENT: Failed to set hostname: %m"); + return log_link_debug_errno(link, r, "DHCP4 CLIENT: Failed to set hostname: %m"); return 0; } @@ -1351,7 +1351,7 @@ static int dhcp4_set_client_identifier(Link *link) { duid->raw_data_len > 0 ? duid->raw_data : NULL, duid->raw_data_len); if (r < 0) - return log_link_warning_errno(link, r, "DHCP4 CLIENT: Failed to set IAID+DUID: %m"); + return log_link_debug_errno(link, r, "DHCP4 CLIENT: Failed to set IAID+DUID: %m"); break; } case DHCP_CLIENT_ID_DUID_ONLY: { @@ -1367,7 +1367,7 @@ static int dhcp4_set_client_identifier(Link *link) { duid->raw_data_len > 0 ? duid->raw_data : NULL, duid->raw_data_len); if (r < 0) - return log_link_warning_errno(link, r, "DHCP4 CLIENT: Failed to set DUID: %m"); + return log_link_debug_errno(link, r, "DHCP4 CLIENT: Failed to set DUID: %m"); break; } case DHCP_CLIENT_ID_MAC: { @@ -1385,7 +1385,7 @@ static int dhcp4_set_client_identifier(Link *link) { hw_addr, hw_addr_len); if (r < 0) - return log_link_warning_errno(link, r, "DHCP4 CLIENT: Failed to set client ID: %m"); + return log_link_debug_errno(link, r, "DHCP4 CLIENT: Failed to set client ID: %m"); break; } default: @@ -1445,7 +1445,7 @@ static bool link_needs_dhcp_broadcast(Link *link) { if (r < 0 && link->sd_device && sd_device_get_property_value(link->sd_device, "ID_NET_DHCP_BROADCAST", &val) >= 0) { r = parse_boolean(val); if (r < 0) - log_link_warning_errno(link, r, "DHCP4 CLIENT: Failed to parse ID_NET_DHCP_BROADCAST, ignoring: %m"); + log_link_debug_errno(link, r, "DHCP4 CLIENT: Failed to parse ID_NET_DHCP_BROADCAST, ignoring: %m"); else log_link_debug(link, "DHCP4 CLIENT: Detected ID_NET_DHCP_BROADCAST='%d'.", r); @@ -1465,7 +1465,7 @@ int dhcp4_configure(Link *link) { return 0; if (link->dhcp_client) - return -EBUSY; /* Already configured. */ + return log_link_debug_errno(link, SYNTHETIC_ERRNO(EBUSY), "DHCP4 client is already configured."); r = dhcp4_configure_duid(link); if (r <= 0) @@ -1473,76 +1473,76 @@ int dhcp4_configure(Link *link) { r = sd_dhcp_client_new(&link->dhcp_client, link->network->dhcp_anonymize); if (r < 0) - return log_link_warning_errno(link, r, "DHCP4 CLIENT: Failed to allocate DHCP4 client: %m"); + return log_link_debug_errno(link, r, "DHCP4 CLIENT: Failed to allocate DHCP4 client: %m"); r = sd_dhcp_client_attach_event(link->dhcp_client, link->manager->event, 0); if (r < 0) - return log_link_warning_errno(link, r, "DHCP4 CLIENT: Failed to attach event to DHCP4 client: %m"); + return log_link_debug_errno(link, r, "DHCP4 CLIENT: Failed to attach event to DHCP4 client: %m"); r = sd_dhcp_client_set_mac(link->dhcp_client, link->hw_addr.bytes, link->bcast_addr.length > 0 ? link->bcast_addr.bytes : NULL, link->hw_addr.length, link->iftype); if (r < 0) - return log_link_warning_errno(link, r, "DHCP4 CLIENT: Failed to set MAC address: %m"); + return log_link_debug_errno(link, r, "DHCP4 CLIENT: Failed to set MAC address: %m"); r = sd_dhcp_client_set_ifindex(link->dhcp_client, link->ifindex); if (r < 0) - return log_link_warning_errno(link, r, "DHCP4 CLIENT: Failed to set ifindex: %m"); + return log_link_debug_errno(link, r, "DHCP4 CLIENT: Failed to set ifindex: %m"); r = sd_dhcp_client_set_callback(link->dhcp_client, dhcp4_handler, link); if (r < 0) - return log_link_warning_errno(link, r, "DHCP4 CLIENT: Failed to set callback: %m"); + return log_link_debug_errno(link, r, "DHCP4 CLIENT: Failed to set callback: %m"); r = sd_dhcp_client_set_request_broadcast(link->dhcp_client, link_needs_dhcp_broadcast(link)); if (r < 0) - return log_link_warning_errno(link, r, "DHCP4 CLIENT: Failed to set request flag for broadcast: %m"); + return log_link_debug_errno(link, r, "DHCP4 CLIENT: Failed to set request flag for broadcast: %m"); if (link->mtu > 0) { r = sd_dhcp_client_set_mtu(link->dhcp_client, link->mtu); if (r < 0) - return log_link_warning_errno(link, r, "DHCP4 CLIENT: Failed to set MTU: %m"); + return log_link_debug_errno(link, r, "DHCP4 CLIENT: Failed to set MTU: %m"); } if (!link->network->dhcp_anonymize) { if (link->network->dhcp_use_mtu) { r = sd_dhcp_client_set_request_option(link->dhcp_client, SD_DHCP_OPTION_INTERFACE_MTU); if (r < 0) - return log_link_warning_errno(link, r, "DHCP4 CLIENT: Failed to set request flag for MTU: %m"); + return log_link_debug_errno(link, r, "DHCP4 CLIENT: Failed to set request flag for MTU: %m"); } if (link->network->dhcp_use_routes) { r = sd_dhcp_client_set_request_option(link->dhcp_client, SD_DHCP_OPTION_STATIC_ROUTE); if (r < 0) - return log_link_warning_errno(link, r, "DHCP4 CLIENT: Failed to set request flag for static route: %m"); + return log_link_debug_errno(link, r, "DHCP4 CLIENT: Failed to set request flag for static route: %m"); r = sd_dhcp_client_set_request_option(link->dhcp_client, SD_DHCP_OPTION_CLASSLESS_STATIC_ROUTE); if (r < 0) - return log_link_warning_errno(link, r, "DHCP4 CLIENT: Failed to set request flag for classless static route: %m"); + return log_link_debug_errno(link, r, "DHCP4 CLIENT: Failed to set request flag for classless static route: %m"); } if (link->network->dhcp_use_domains != DHCP_USE_DOMAINS_NO) { r = sd_dhcp_client_set_request_option(link->dhcp_client, SD_DHCP_OPTION_DOMAIN_SEARCH_LIST); if (r < 0) - return log_link_warning_errno(link, r, "DHCP4 CLIENT: Failed to set request flag for domain search list: %m"); + return log_link_debug_errno(link, r, "DHCP4 CLIENT: Failed to set request flag for domain search list: %m"); } if (link->network->dhcp_use_ntp) { r = sd_dhcp_client_set_request_option(link->dhcp_client, SD_DHCP_OPTION_NTP_SERVER); if (r < 0) - return log_link_warning_errno(link, r, "DHCP4 CLIENT: Failed to set request flag for NTP server: %m"); + return log_link_debug_errno(link, r, "DHCP4 CLIENT: Failed to set request flag for NTP server: %m"); } if (link->network->dhcp_use_sip) { r = sd_dhcp_client_set_request_option(link->dhcp_client, SD_DHCP_OPTION_SIP_SERVER); if (r < 0) - return log_link_warning_errno(link, r, "DHCP4 CLIENT: Failed to set request flag for SIP server: %m"); + return log_link_debug_errno(link, r, "DHCP4 CLIENT: Failed to set request flag for SIP server: %m"); } if (link->network->dhcp_use_timezone) { r = sd_dhcp_client_set_request_option(link->dhcp_client, SD_DHCP_OPTION_NEW_TZDB_TIMEZONE); if (r < 0) - return log_link_warning_errno(link, r, "DHCP4 CLIENT: Failed to set request flag for timezone: %m"); + return log_link_debug_errno(link, r, "DHCP4 CLIENT: Failed to set request flag for timezone: %m"); } SET_FOREACH(request_options, link->network->dhcp_request_options) { @@ -1550,7 +1550,7 @@ int dhcp4_configure(Link *link) { r = sd_dhcp_client_set_request_option(link->dhcp_client, option); if (r < 0) - return log_link_warning_errno(link, r, "DHCP4 CLIENT: Failed to set request flag for '%u': %m", option); + return log_link_debug_errno(link, r, "DHCP4 CLIENT: Failed to set request flag for '%u': %m", option); } ORDERED_HASHMAP_FOREACH(send_option, link->network->dhcp_client_send_options) { @@ -1558,7 +1558,7 @@ int dhcp4_configure(Link *link) { if (r == -EEXIST) continue; if (r < 0) - return log_link_warning_errno(link, r, "DHCP4 CLIENT: Failed to set send option: %m"); + return log_link_debug_errno(link, r, "DHCP4 CLIENT: Failed to set send option: %m"); } ORDERED_HASHMAP_FOREACH(send_option, link->network->dhcp_client_send_vendor_options) { @@ -1566,7 +1566,7 @@ int dhcp4_configure(Link *link) { if (r == -EEXIST) continue; if (r < 0) - return log_link_warning_errno(link, r, "DHCP4 CLIENT: Failed to set send option: %m"); + return log_link_debug_errno(link, r, "DHCP4 CLIENT: Failed to set send option: %m"); } r = dhcp4_set_hostname(link); @@ -1577,49 +1577,49 @@ int dhcp4_configure(Link *link) { r = sd_dhcp_client_set_vendor_class_identifier(link->dhcp_client, link->network->dhcp_vendor_class_identifier); if (r < 0) - return log_link_warning_errno(link, r, "DHCP4 CLIENT: Failed to set vendor class identifier: %m"); + return log_link_debug_errno(link, r, "DHCP4 CLIENT: Failed to set vendor class identifier: %m"); } if (link->network->dhcp_mudurl) { r = sd_dhcp_client_set_mud_url(link->dhcp_client, link->network->dhcp_mudurl); if (r < 0) - return log_link_warning_errno(link, r, "DHCP4 CLIENT: Failed to set MUD URL: %m"); + return log_link_debug_errno(link, r, "DHCP4 CLIENT: Failed to set MUD URL: %m"); } if (link->network->dhcp_user_class) { r = sd_dhcp_client_set_user_class(link->dhcp_client, link->network->dhcp_user_class); if (r < 0) - return log_link_warning_errno(link, r, "DHCP4 CLIENT: Failed to set user class: %m"); + return log_link_debug_errno(link, r, "DHCP4 CLIENT: Failed to set user class: %m"); } } if (link->network->dhcp_client_port > 0) { r = sd_dhcp_client_set_client_port(link->dhcp_client, link->network->dhcp_client_port); if (r < 0) - return log_link_warning_errno(link, r, "DHCP4 CLIENT: Failed to set listen port: %m"); + return log_link_debug_errno(link, r, "DHCP4 CLIENT: Failed to set listen port: %m"); } if (link->network->dhcp_max_attempts > 0) { r = sd_dhcp_client_set_max_attempts(link->dhcp_client, link->network->dhcp_max_attempts); if (r < 0) - return log_link_warning_errno(link, r, "DHCP4 CLIENT: Failed to set max attempts: %m"); + return log_link_debug_errno(link, r, "DHCP4 CLIENT: Failed to set max attempts: %m"); } if (link->network->dhcp_ip_service_type > 0) { r = sd_dhcp_client_set_service_type(link->dhcp_client, link->network->dhcp_ip_service_type); if (r < 0) - return log_link_warning_errno(link, r, "DHCP4 CLIENT: Failed to set IP service type: %m"); + return log_link_debug_errno(link, r, "DHCP4 CLIENT: Failed to set IP service type: %m"); } if (link->network->dhcp_fallback_lease_lifetime > 0) { r = sd_dhcp_client_set_fallback_lease_lifetime(link->dhcp_client, link->network->dhcp_fallback_lease_lifetime); if (r < 0) - return log_link_warning_errno(link, r, "DHCP4 CLIENT: Failed set to lease lifetime: %m"); + return log_link_debug_errno(link, r, "DHCP4 CLIENT: Failed set to lease lifetime: %m"); } r = dhcp4_set_request_address(link); if (r < 0) - return log_link_warning_errno(link, r, "DHCP4 CLIENT: Failed to set initial DHCPv4 address: %m"); + return log_link_debug_errno(link, r, "DHCP4 CLIENT: Failed to set initial DHCPv4 address: %m"); return dhcp4_set_client_identifier(link); } diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c index 17fb932f81a..e31da3a9a58 100644 --- a/src/network/networkd-link.c +++ b/src/network/networkd-link.c @@ -1129,7 +1129,7 @@ static int link_configure(Link *link) { r = dhcp4_configure(link); if (r < 0) - return r; + return log_link_warning_errno(link, r, "Failed to configure DHCP4 client: %m"); r = dhcp6_configure(link); if (r < 0)