Fix: inspect multiple networks stops at first inspect fail #1870

yzxiu · 2023-01-18T03:15:24Z

n: aliased to sudo nerdctl

 ~ n network ls                                         
NETWORK ID      NAME               FILE
                k8s-pod-network    /etc/cni/net.d/10-calico.conflist
44262d4ba0d3    58de8b120c68       /etc/cni/net.d/nerdctl-58de8b120c68.conflist
17f29b073143    bridge             /etc/cni/net.d/nerdctl-bridge.conflist
f9d6cec6deab    deleteme           /etc/cni/net.d/nerdctl-deleteme.conflist
58de8b120c68    nerdctl_default    /etc/cni/net.d/nerdctl-nerdctl_default.conflist
84584c571686    xiu_default        /etc/cni/net.d/nerdctl-xiu_default.conflist
                host               
                none

1、Add the option to inspect a network by id

before:

~ n network inspect f9d6cec6deab                                   
FATA[0000] no such network: f9d6cec6deab

after:

n network inspect f9d6cec6deab
[
    {
        "Name": "deleteme",
        "Id": "f9d6cec6deabf54691804bb7c1bf02ad7f461ab07f31a18398495b9de1cabf28",
        "IPAM": {
            "Config": [
                {
                    "Subnet": "10.10.11.0/24",
                    "Gateway": "10.10.11.1"
                }
            ]
        },
        "Labels": {}
    }
]

2、Fix: inspect multiple networks stops at first inspect fail

before:

n network inspect notfound bridge f9d6cec6deab k8s-pod-network notfound2
FATA[0000] no such network: notfound

after:

n network inspect notfound bridge f9d6cec6deab k8s-pod-network notfound2
[
    {
        "Name": "bridge",
        "Id": "17f29b073143d8cd97b5bbe492bdeffec1c5fee55cc1fe2112c8b9335f8b6121",
        "IPAM": {
            "Config": [
                {
                    "Subnet": "10.4.0.0/24",
                    "Gateway": "10.4.0.1"
                }
            ]
        },
        "Labels": {}
    },
    {
        "Name": "deleteme",
        "Id": "f9d6cec6deabf54691804bb7c1bf02ad7f461ab07f31a18398495b9de1cabf28",
        "IPAM": {
            "Config": [
                {
                    "Subnet": "10.10.11.0/24",
                    "Gateway": "10.10.11.1"
                }
            ]
        },
        "Labels": {}
    },
    {
        "Name": "k8s-pod-network",
        "IPAM": {},
        "Labels": null
    }
]
ERRO[0000] No such network: notfound                    
ERRO[0000] No such network: notfound2

Signed-off-by: yaozhenxiu 946666800@qq.com

djdongjin · 2023-01-18T03:33:54Z

cmd/nerdctl/network_inspect.go

+
+	walker := netwalker.NetworkWalker{
+		Client: e,
+		OnFound: func(ctx context.Context, found netwalker.Found) error {


Probably we need to check if found.MatchCount == 1 and return error if not. Otherwise a prefix (e.g., nerdctl network inspect a) corresponding to multiple ids will print all.

manugupt1 · 2023-01-18T06:29:05Z

cmd/nerdctl/network_inspect.go

 	if err != nil {
 		return err
 	}
-	return formatter.FormatSlice(format, cmd.OutOrStdout(), result)
+	for _, e := range errs {
+		logrus.Errorln(e)


logrus.WithError(err).Errorf

logrus.WithError(err).Errorf

PTAL

manugupt1 · 2023-01-18T06:31:17Z

cmd/nerdctl/network_inspect.go

+	}
+
+	// compatible with docker
+	// ExitCodeError is to allow the program to exit with status code 1 without outputting an error message.


Would not logrus print log anyway?

Would not logrus print log anyway?

sorry, i can't get your point

Sorry! I think this comment does not make sense; since you will probably log an error when it occurs.

comment removed

cmd/nerdctl/network_inspect.go

djdongjin

left some nits, otherwise LGTM, thanks

djdongjin · 2023-01-19T04:05:37Z

cmd/nerdctl/network_inspect.go

+		n, err := walker.Walk(cmd.Context(), name)
+		if err != nil {
+			errs = append(errs, err)
+			continue


nit: this continue is not necessary

djdongjin · 2023-01-19T04:08:58Z

cmd/nerdctl/network_inspect.go

+	for _, err := range errs {
+		logrus.Error(err)
+	}


nit: this can be moved into the if len(errs) > 0 since they're all code only related to errors.

fahedouch

Thanks

Signed-off-by: yaozhenxiu <946666800@qq.com>

AkihiroSuda

Thanks

yzxiu force-pushed the network-inspect branch 2 times, most recently from d1f3a24 to 6c43b42 Compare January 18, 2023 03:19

djdongjin reviewed Jan 18, 2023

View reviewed changes

yzxiu force-pushed the network-inspect branch 4 times, most recently from ce40a8b to 4bd3de9 Compare January 18, 2023 04:56

manugupt1 reviewed Jan 18, 2023

View reviewed changes

yzxiu force-pushed the network-inspect branch from bdf3e25 to b0f5ee5 Compare January 18, 2023 07:14

fahedouch reviewed Jan 18, 2023

View reviewed changes

cmd/nerdctl/network_inspect.go Outdated Show resolved Hide resolved

yzxiu force-pushed the network-inspect branch 8 times, most recently from 4fd4a21 to aab0d95 Compare January 19, 2023 02:52

djdongjin approved these changes Jan 19, 2023

View reviewed changes

yzxiu force-pushed the network-inspect branch 2 times, most recently from 6dcfbf2 to 4901595 Compare January 19, 2023 05:15

fahedouch approved these changes Jan 19, 2023

View reviewed changes

fahedouch added this to the v1.2.0 milestone Jan 19, 2023

yzxiu force-pushed the network-inspect branch 7 times, most recently from 87aa240 to 38e69b2 Compare January 21, 2023 12:44

yzxiu force-pushed the network-inspect branch 2 times, most recently from 8541625 to 9791701 Compare January 21, 2023 15:22

yzxiu closed this Jan 23, 2023

yzxiu force-pushed the network-inspect branch from 56415e5 to f836460 Compare January 23, 2023 12:57

yzxiu reopened this Jan 23, 2023

yzxiu force-pushed the network-inspect branch 2 times, most recently from 5503928 to 5a19d30 Compare January 23, 2023 19:04

Fix: inspect multiple networks stops at first inspect fail

ea9ac34

Signed-off-by: yaozhenxiu <946666800@qq.com>

yzxiu force-pushed the network-inspect branch from 5a19d30 to ea9ac34 Compare January 24, 2023 00:36

AkihiroSuda approved these changes Jan 25, 2023

View reviewed changes

AkihiroSuda merged commit fa5b5ca into containerd:main Jan 25, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix: inspect multiple networks stops at first inspect fail #1870

Fix: inspect multiple networks stops at first inspect fail #1870

yzxiu commented Jan 18, 2023 •

edited

djdongjin Jan 18, 2023

yzxiu Jan 18, 2023

manugupt1 Jan 18, 2023

yzxiu Jan 18, 2023

manugupt1 Jan 18, 2023

yzxiu Jan 18, 2023

manugupt1 Jan 19, 2023 •

edited

yzxiu Jan 19, 2023 •

edited

djdongjin left a comment

djdongjin Jan 19, 2023

yzxiu Jan 19, 2023

djdongjin Jan 19, 2023

yzxiu Jan 19, 2023

fahedouch left a comment

AkihiroSuda left a comment

Fix: inspect multiple networks stops at first inspect fail #1870

Fix: inspect multiple networks stops at first inspect fail #1870

Conversation

yzxiu commented Jan 18, 2023 • edited

1、Add the option to inspect a network by id

2、Fix: inspect multiple networks stops at first inspect fail

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

manugupt1 Jan 19, 2023 • edited

Choose a reason for hiding this comment

yzxiu Jan 19, 2023 • edited

Choose a reason for hiding this comment

djdongjin left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

fahedouch left a comment

Choose a reason for hiding this comment

AkihiroSuda left a comment

Choose a reason for hiding this comment

yzxiu commented Jan 18, 2023 •

edited

manugupt1 Jan 19, 2023 •

edited

yzxiu Jan 19, 2023 •

edited