diff options
| author | cl2017 <chenlin.liu@daocloud.io> | 2023-12-06 19:25:51 +0800 |
|---|---|---|
| committer | cl2017 <chenlin.liu@daocloud.io> | 2023-12-06 19:25:51 +0800 |
| commit | b5ba338a95a8c437efa751d029d588e30c9f98b2 (patch) | |
| tree | c7a889d38bcc4fdade6c8c452abf1cfd00e6efae /edge | |
| parent | Merge pull request #5270 from Shelley-BaoYue/fix-featuregates (diff) | |
| download | kubeedge-b5ba338a95a8c437efa751d029d588e30c9f98b2.tar.gz | |
fix mutex unlock
Signed-off-by: cl2017 <chenlin.liu@daocloud.io>
Diffstat (limited to 'edge')
| -rw-r--r-- | edge/pkg/devicetwin/dmiserver/server.go | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/edge/pkg/devicetwin/dmiserver/server.go b/edge/pkg/devicetwin/dmiserver/server.go index cfc591acb..d4818f999 100644 --- a/edge/pkg/devicetwin/dmiserver/server.go +++ b/edge/pkg/devicetwin/dmiserver/server.go @@ -91,11 +91,8 @@ func (s *server) MapperRegister(ctx context.Context, in *pb.MapperRegisterReques var deviceList []*pb.Device var deviceModelList []*pb.DeviceModel s.dmiCache.DeviceMu.Lock() - defer s.dmiCache.DeviceMu.Unlock() for _, device := range s.dmiCache.DeviceList { - protocol := device.Spec.Protocol.ProtocolName - - if protocol == in.Mapper.Protocol { + if device.Spec.Protocol.ProtocolName == in.Mapper.Protocol { dev, err := dtcommon.ConvertDevice(device) if err != nil { klog.Errorf("fail to convert device %s with err: %v", device.Name, err) @@ -118,6 +115,8 @@ func (s *server) MapperRegister(ctx context.Context, in *pb.MapperRegisterReques deviceModelList = append(deviceModelList, dm) } } + s.dmiCache.DeviceMu.Unlock() + dmiclient.DMIClientsImp.CreateDMIClient(in.Mapper.Protocol, string(in.Mapper.Address)) return &pb.MapperRegisterResponse{ |