services/introspection: support to show introspection grpc service plugin #5455

Iceber · 2021-05-06T05:19:05Z

ctr plugins ls does not display the introspection grpc service plugin

# ctr plugins ls                                                                         
TYPE                            ID                       PLATFORMS      STATUS
io.containerd.content.v1        content                  -              ok
io.containerd.snapshotter.v1    aufs                     linux/amd64    error
io.containerd.snapshotter.v1    btrfs                    linux/amd64    error
io.containerd.snapshotter.v1    devmapper                linux/amd64    error
io.containerd.snapshotter.v1    native                   linux/amd64    ok
io.containerd.snapshotter.v1    overlayfs                linux/amd64    ok
io.containerd.snapshotter.v1    zfs                      linux/amd64    error
io.containerd.metadata.v1       bolt                     -              ok
io.containerd.differ.v1         walking                  linux/amd64    ok
io.containerd.gc.v1             scheduler                -              ok
io.containerd.service.v1        introspection-service    -              ok
io.containerd.service.v1        containers-service       -              ok
io.containerd.service.v1        content-service          -              ok
io.containerd.service.v1        diff-service             -              ok
io.containerd.service.v1        images-service           -              ok
io.containerd.service.v1        leases-service           -              ok
io.containerd.service.v1        namespaces-service       -              ok
io.containerd.service.v1        snapshots-service        -              ok
io.containerd.runtime.v1        linux                    linux/amd64    ok
io.containerd.runtime.v2        task                     linux/amd64    ok
io.containerd.monitor.v1        cgroups                  linux/amd64    ok
io.containerd.service.v1        tasks-service            -              ok
io.containerd.internal.v1       restart                  -              ok
io.containerd.grpc.v1           containers               -              ok
io.containerd.grpc.v1           content                  -              ok
io.containerd.grpc.v1           diff                     -              ok
io.containerd.grpc.v1           events                   -              ok
io.containerd.grpc.v1           healthcheck              -              ok
io.containerd.grpc.v1           images                   -              ok
io.containerd.grpc.v1           leases                   -              ok
io.containerd.grpc.v1           namespaces               -              ok
io.containerd.internal.v1       opt                      -              ok
io.containerd.grpc.v1           snapshots                -              ok
io.containerd.grpc.v1           tasks                    -              ok
io.containerd.grpc.v1           version                  -              ok
io.containerd.grpc.v1           cri                      linux/amd64    ok

analysis

The Plugins method of the introspection grpc service does not show itself and the plugins initialised after it.

When the introspection grpc service is initialised, it will get the list of currently registered plugins from the plugin context, which will not contain itself and plugins that have not yet been initialised.

Add to initialization list when initialization is complete:

containerd/services/server/server.go

Lines 168 to 173 in 1431679

    
           result := p.Init(initContext) 
        
           if err := initialized.Add(result); err != nil { 
        
           	return nil, errors.Wrapf(err, "could not add plugin result to plugin set") 
        
           } 
        
           instance, err := result.Instance()

When the introspection grpc service is initialised, it will get the list of currently registered plugins from the plugin context, which will not contain itself and plugins that have not yet been initialised.

containerd/services/introspection/service.go

Lines 53 to 64 in 1431679

    
           	allPluginsPB := pluginsToPB(ic.GetAll()) 
        
           	localClient, ok := i.(*Local) 
        
           	if !ok { 
        
           		return nil, errors.Errorf("Could not create a local client for introspection service") 
        
           	} 
        
           	localClient.UpdateLocal(ic.Root, allPluginsPB) 
        
           	return &server{ 
        
           		local: localClient, 
        
           	}, nil 
        
           },

Although the introspection grpc service requires itself to be initialized last(Requires: []plugin.Type{"*"}), it still allows Requests from other plugins to also be *, and if these plugins are registered by calling plugin.Register before the introspection grpc service, they will be initialized after the introspection grpc service when using plugin.Graph sorting.

output

# ctr plugin ls
TYPE                            ID                       PLATFORMS      STATUS
io.containerd.content.v1        content                  -              ok
io.containerd.snapshotter.v1    aufs                     linux/amd64    error
io.containerd.snapshotter.v1    btrfs                    linux/amd64    error
io.containerd.snapshotter.v1    devmapper                linux/amd64    error
io.containerd.snapshotter.v1    native                   linux/amd64    ok
io.containerd.snapshotter.v1    overlayfs                linux/amd64    ok
io.containerd.snapshotter.v1    zfs                      linux/amd64    error
io.containerd.metadata.v1       bolt                     -              ok
io.containerd.differ.v1         walking                  linux/amd64    ok
io.containerd.gc.v1             scheduler                -              ok
io.containerd.service.v1        introspection-service    -              ok
io.containerd.service.v1        containers-service       -              ok
io.containerd.service.v1        content-service          -              ok
io.containerd.service.v1        diff-service             -              ok
io.containerd.service.v1        images-service           -              ok
io.containerd.service.v1        leases-service           -              ok
io.containerd.service.v1        namespaces-service       -              ok
io.containerd.service.v1        snapshots-service        -              ok
io.containerd.runtime.v1        linux                    linux/amd64    ok
io.containerd.runtime.v2        task                     linux/amd64    ok
io.containerd.monitor.v1        cgroups                  linux/amd64    ok
io.containerd.service.v1        tasks-service            -              ok
io.containerd.grpc.v1           introspection            -              ok
io.containerd.internal.v1       restart                  -              ok
io.containerd.grpc.v1           containers               -              ok
io.containerd.grpc.v1           content                  -              ok
io.containerd.grpc.v1           diff                     -              ok
io.containerd.grpc.v1           events                   -              ok
io.containerd.grpc.v1           healthcheck              -              ok
io.containerd.grpc.v1           images                   -              ok
io.containerd.grpc.v1           leases                   -              ok
io.containerd.grpc.v1           namespaces               -              ok
io.containerd.internal.v1       opt                      -              ok
io.containerd.grpc.v1           snapshots                -              ok
io.containerd.grpc.v1           tasks                    -              ok
io.containerd.grpc.v1           version                  -              ok
io.containerd.grpc.v1           cri                      linux/amd64    ok

k8s-ci-robot · 2021-05-06T05:19:13Z

Hi @Iceber. Thanks for your PR.

I'm waiting for a containerd member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

theopenlab-ci · 2021-05-06T05:48:17Z

Build succeeded.

containerd-build-arm64 : SUCCESS in 4m 52s (non-voting)
containerd-test-arm64 : SUCCESS in 5m 36s (non-voting)
containerd-integration-test-arm64 : FAILURE in 27m 39s (non-voting)

theopenlab-ci · 2021-05-06T07:48:01Z

Build succeeded.

containerd-build-arm64 : SUCCESS in 4m 42s (non-voting)
containerd-test-arm64 : SUCCESS in 5m 30s (non-voting)
containerd-integration-test-arm64 : SUCCESS in 22m 46s (non-voting)

Signed-off-by: Iceber Gu <wei.cai-nat@daocloud.io>

theopenlab-ci · 2021-05-07T13:32:31Z

Build succeeded.

containerd-build-arm64 : SUCCESS in 4m 47s (non-voting)
containerd-test-arm64 : SUCCESS in 5m 28s (non-voting)
containerd-integration-test-arm64 : SUCCESS in 23m 09s (non-voting)

Iceber · 2021-05-08T01:37:19Z

@stevvooe @AkihiroSuda PTAL, Thanks

kzys · 2021-06-15T23:46:53Z

/ok-to-test

kzys · 2021-07-02T21:49:30Z

@containerd/committers Can someone take a look?

dmcgowan · 2021-11-17T01:20:03Z

plugin/plugin.go

+		return false
+	}
+	for _, reg := range register.r {
+		byID, typeok := plugins.byTypeAndID[reg.Type]


The race detector does not complain about this?

dmcgowan · 2021-11-17T01:20:51Z

services/introspection/local.go

@@ -94,9 +91,16 @@ func (l *Local) Plugins(ctx context.Context, req *api.PluginsRequest, _ ...grpc.
 }

 func (l *Local) getPlugins() []api.Plugin {
+	if !plugin.AreRegisteredPluginsInitialized(l.plugins) {


Instead of checking against registered, can you just check the size against what is already cached. If it changes, then update the cache.

dmcgowan · 2022-01-11T21:41:56Z

Carried in #6432

Iceber · 2022-01-12T02:33:37Z

@dmcgowan I'm sorry, I forgot to continue processing this pr

k8s-ci-robot added the needs-ok-to-test label May 6, 2021

Iceber force-pushed the fix-introspection-service branch from d191f9d to 0784f46 Compare May 6, 2021 07:23

Iceber changed the title ~~services/introspection: support to show introspection grpc service~~ services/introspection: support to show introspection grpc service plugin May 6, 2021

Iceber force-pushed the fix-introspection-service branch from 0784f46 to 350ad28 Compare May 7, 2021 13:06

services/introspection: support to show introspection grpc service

c3fe456

Signed-off-by: Iceber Gu <wei.cai-nat@daocloud.io>

Iceber force-pushed the fix-introspection-service branch from 350ad28 to c3fe456 Compare May 7, 2021 13:07

kzys approved these changes Jun 15, 2021

View reviewed changes

k8s-ci-robot added ok-to-test and removed needs-ok-to-test labels Jun 15, 2021

dmcgowan added this to Ready For Review in Code Review Jul 23, 2021

dmcgowan added this to the 1.6 milestone Nov 17, 2021

dmcgowan reviewed Nov 17, 2021

View reviewed changes

kzys moved this from Ready For Review to Needs Contributor Update in Code Review Nov 30, 2021

dmcgowan mentioned this pull request Jan 11, 2022

services/introspection: fix plugin caching to show grpc plugins #6432

Merged

dmcgowan closed this Jan 11, 2022

Code Review automation moved this from Needs Contributor Update to Done Jan 11, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

services/introspection: support to show introspection grpc service plugin #5455

services/introspection: support to show introspection grpc service plugin #5455

Iceber commented May 6, 2021 •

edited

k8s-ci-robot commented May 6, 2021

theopenlab-ci bot commented May 6, 2021

theopenlab-ci bot commented May 6, 2021

theopenlab-ci bot commented May 7, 2021

Iceber commented May 8, 2021

kzys commented Jun 15, 2021

kzys commented Jul 2, 2021

dmcgowan Nov 17, 2021

dmcgowan Nov 17, 2021

dmcgowan commented Jan 11, 2022

Iceber commented Jan 12, 2022

	result := p.Init(initContext)
	if err := initialized.Add(result); err != nil {
	return nil, errors.Wrapf(err, "could not add plugin result to plugin set")
	}

	instance, err := result.Instance()

	allPluginsPB := pluginsToPB(ic.GetAll())

	localClient, ok := i.(*Local)
	if !ok {
	return nil, errors.Errorf("Could not create a local client for introspection service")
	}
	localClient.UpdateLocal(ic.Root, allPluginsPB)

	return &server{
	local: localClient,
	}, nil
	},

services/introspection: support to show introspection grpc service plugin #5455

services/introspection: support to show introspection grpc service plugin #5455

Conversation

Iceber commented May 6, 2021 • edited

analysis

output

k8s-ci-robot commented May 6, 2021

theopenlab-ci bot commented May 6, 2021

theopenlab-ci bot commented May 6, 2021

theopenlab-ci bot commented May 7, 2021

Iceber commented May 8, 2021

kzys commented Jun 15, 2021

kzys commented Jul 2, 2021

dmcgowan Nov 17, 2021

Choose a reason for hiding this comment

dmcgowan Nov 17, 2021

Choose a reason for hiding this comment

dmcgowan commented Jan 11, 2022

Iceber commented Jan 12, 2022

Iceber commented May 6, 2021 •

edited