opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-11 10:25:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3488 from marcov/ctr-or-pod-id

Browse Source 
libpod: discerne partial IDs between containers and pods
This commit is contained in:
OpenShift Merge Robot
2019-07-03 16:55:24 +02:00
committed by GitHub
parent 0e8b66cc68 64a91b09ae
commit f5593d305f
1 changed files with 2 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
libpod/boltdb_state.go
View File

@ -381,11 +381,6 @@ func (s *BoltState) LookupContainer(idOrName string) (*Container, error) {
defer s.closeDBCon(db) defer s.closeDBCon(db)
err = db.View(func(tx *bolt.Tx) error { err = db.View(func(tx *bolt.Tx) error {
idBucket, err := getIDBucket(tx)
if err != nil {
return err
}
ctrBucket, err := getCtrBucket(tx) ctrBucket, err := getCtrBucket(tx)
if err != nil { if err != nil {
return err return err
@ -436,7 +431,7 @@ func (s *BoltState) LookupContainer(idOrName string) (*Container, error) {
// We were not given a full container ID or name. // We were not given a full container ID or name.
// Search for partial ID matches. // Search for partial ID matches.
exists := false exists := false
err = idBucket.ForEach(func(checkID, checkName []byte) error { err = ctrBucket.ForEach(func(checkID, checkName []byte) error {
// If the container isn't in our namespace, we // If the container isn't in our namespace, we
// can't match it // can't match it
if s.namespaceBytes != nil { if s.namespaceBytes != nil {
@ -963,11 +958,6 @@ func (s *BoltState) LookupPod(idOrName string) (*Pod, error) {
defer s.closeDBCon(db) defer s.closeDBCon(db)
err = db.View(func(tx *bolt.Tx) error { err = db.View(func(tx *bolt.Tx) error {
idBucket, err := getIDBucket(tx)
if err != nil {
return err
}
podBkt, err := getPodBucket(tx) podBkt, err := getPodBucket(tx)
if err != nil { if err != nil {
return err return err
@ -1015,7 +1005,7 @@ func (s *BoltState) LookupPod(idOrName string) (*Pod, error) {
// They did not give us a full pod name or ID. // They did not give us a full pod name or ID.
// Search for partial ID matches. // Search for partial ID matches.
exists := false exists := false
err = idBucket.ForEach(func(checkID, checkName []byte) error { err = podBkt.ForEach(func(checkID, checkName []byte) error {
// If the pod isn't in our namespace, we // If the pod isn't in our namespace, we
// can't match it // can't match it
if s.namespaceBytes != nil { if s.namespaceBytes != nil {