Merge pull request systemd#19449 from yuwata/network-downgrade-log-level

yuwata · web-flow · commit bf8a5f64730c · 2021-04-29T08:54:08.000+09:00
network: downgrade log level and fix typo
diff --git a/src/network/networkd-dhcp4.c b/src/network/networkd-dhcp4.c
@@ -358,7 +358,7 @@ static int link_set_dhcp_static_routes(Link *link, struct in_addr *ret_default_g
         /* if the DHCP server returns both a Classless Static Routes option and a Static Routes option,
          * the DHCP client MUST ignore the Static Routes option. */
         if (classless_route && static_route)
-                log_link_warning(link, "Classless static routes received from DHCP server: ignoring static-route option");
+                log_link_debug(link, "Classless static routes received from DHCP server: ignoring static-route option");
 
         r = route_new(&route);
         if (r < 0)
diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
@@ -2450,7 +2450,7 @@ static int link_add(Manager *m, sd_netlink_message *message, Link **ret) {
                 sprintf(ifindex_str, "n%d", link->ifindex);
                 r = sd_device_new_from_device_id(&device, ifindex_str);
                 if (r < 0) {
-                        log_link_warning_errno(link, r, "Could not find device, waiting for device initialization: %m");
+                        log_link_debug_errno(link, r, "Could not find device, waiting for device initialization: %m");
                         return 0;
                 }
 
diff --git a/src/network/networkd-ndisc.c b/src/network/networkd-ndisc.c
@@ -558,7 +558,7 @@ static int ndisc_router_process_default(Link *link, sd_ndisc_router *rt) {
                 if (!route_gw->protocol_set)
                         route_gw->protocol = RTPROT_RA;
                 if (!route_gw->pref_set)
-                        route->pref = preference;
+                        route_gw->pref = preference;
                 route_gw->lifetime = usec_add(time_now, lifetime * USEC_PER_SEC);
                 if (route_gw->mtu == 0)
                         route_gw->mtu = mtu;
diff --git a/src/network/networkd-neighbor.c b/src/network/networkd-neighbor.c
@@ -500,10 +500,9 @@ int manager_rtnl_process_neighbor(sd_netlink *rtnl, sd_netlink_message *message,
 
         r = link_get(m, ifindex, &link);
         if (r < 0 || !link) {
-                /* when enumerating we might be out of sync, but we will get the neighbor again, so just
-                 * ignore it */
-                if (!m->enumerating)
-                        log_warning("rtnl: received neighbor for link '%d' we don't know about, ignoring.", ifindex);
+                /* when enumerating we might be out of sync, but we will get the neighbor again. Also,
+                 * kernel sends messages about neighbors after a link is removed. So, just ignore it. */
+                log_debug("rtnl: received neighbor for link '%d' we don't know about, ignoring.", ifindex);
                 return 0;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -2450,7 +2450,7 @@ static int link_add(Manager m, sd_netlink_message message, Link **ret) {`
`2450`	`2450`	`sprintf(ifindex_str, "n%d", link->ifindex);`
`2451`	`2451`	`r = sd_device_new_from_device_id(&device, ifindex_str);`
`2452`	`2452`	`if (r < 0) {`
`2453`		`- log_link_warning_errno(link, r, "Could not find device, waiting for device initialization: %m");`
	`2453`	`+ log_link_debug_errno(link, r, "Could not find device, waiting for device initialization: %m");`
`2454`	`2454`	`return 0;`
`2455`	`2455`	`}`
`2456`	`2456`