Skip to content

Commit c2b8d30

Browse files
authored
Revert container_manager changes (#1483)
* Revert "Set container_id from lookup key" This reverts commit fec8b86. * Revert "Collapse m_metadata_complete and m_successful into a single enum (2/2)" This reverts commit da37652. * Revert "Collapse m_metadata_complete and m_successful into a single enum (1/2)" This reverts commit 2ac3111. * Revert "Track container lookup progress in a separate map" This reverts commit bc339ba. * Revert "Remove unused declarations" This reverts commit 8adf0bb. * Revert "`sinsp_container_manager` nits" This reverts commit 31c9689. * Revert "Make async CRI and async CRI resource lookup configurable" This reverts commit dac75ef. * Revert "Fully async CRI lookup" This reverts commit 4236e31. * Revert "Make CRI initialization a separate function" This reverts commit 4b77b87. * Revert "Use just one `container_info` struct" This reverts commit 132ff12. * Revert "Get CRI resource limits from cgroups" This reverts commit 188b9ee. * Revert "Support lookup of per-subsystem cgroup mount points" This reverts commit 5308360. * Revert "Allow lookup of specific cgroups of a thread by subsystem name" This reverts commit e0c9b99. * Revert "Configurable Docker socket" This reverts commit fa67879. * Revert "Don't roundtrip via JSON for internally generated container events" This reverts commit 27eff62. * Revert "Only do a container lookup once per engine" This reverts commit cfa76c0. * Revert "Convert docker to async engine infra" This reverts commit 855664b. * Revert "Make a helper method to get or create a container object" This reverts commit 45261ef. * Revert "Async container engine infrastructure, the common parts" This reverts commit 8b82f50. * Revert "Synchronize access to `container_manager::m_containers`" This reverts commit 5893893. * Revert "A simple mutex guard class, owning the locked data" This reverts commit 1dc2fc1. * Revert "Make container.h self-sufficient" This reverts commit f65dfeb. * Revert "Use `auto` for the value of `get_containers()`" This reverts commit b95d398.
1 parent e35f055 commit c2b8d30

21 files changed

+205
-1181
lines changed

userspace/libsinsp/CMakeLists.txt

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -134,13 +134,11 @@ endif()
134134

135135
if(NOT WIN32 AND NOT APPLE)
136136
list(APPEND SINSP_SOURCES
137-
async_cgroup.cpp
137+
grpc_channel_registry.cpp
138138
cri.cpp
139139
container_engine/cri.cpp
140140
${CMAKE_CURRENT_BINARY_DIR}/cri.grpc.pb.cc
141-
${CMAKE_CURRENT_BINARY_DIR}/cri.pb.cc
142-
grpc_channel_registry.cpp
143-
)
141+
${CMAKE_CURRENT_BINARY_DIR}/cri.pb.cc)
144142
endif()
145143

146144
add_library(sinsp STATIC ${SINSP_SOURCES})

userspace/libsinsp/async_cgroup.cpp

Lines changed: 0 additions & 126 deletions
This file was deleted.

userspace/libsinsp/async_cgroup.h

Lines changed: 0 additions & 158 deletions
This file was deleted.

userspace/libsinsp/async_container.h

Lines changed: 0 additions & 94 deletions
This file was deleted.

0 commit comments

Comments
 (0)