Skip to content

Commit

Permalink
fix EnableContainerdUpperDirDetect not effective
Browse files Browse the repository at this point in the history
  • Loading branch information
yyuuttaaoo authored and qwtsc committed Jan 18, 2025
1 parent 03ea6cb commit 5c42010
Show file tree
Hide file tree
Showing 9 changed files with 12 additions and 15 deletions.
3 changes: 0 additions & 3 deletions core/common/LogtailCommonFlags.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,4 @@ DEFINE_FLAG_STRING(fuse_root_dir, "root dir for fuse file polling", "/home/admin
DEFINE_FLAG_INT32(fuse_dir_max_depth, "max depth from fuse root dir", 100);
DEFINE_FLAG_INT32(fuse_file_max_count, "max file total count from fuse root dir", 10000);
DEFINE_FLAG_BOOL(enable_root_path_collection, "", false);
DEFINE_FLAG_BOOL(enable_containerd_upper_dir_detect,
"if enable containerd upper dir detect when locating rootfs",
false);
DEFINE_FLAG_BOOL(enable_sls_metrics_format, "if enable format metrics in SLS metricstore log pattern", true);
1 change: 0 additions & 1 deletion core/common/LogtailCommonFlags.h
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@ DECLARE_FLAG_STRING(default_region_name);
DECLARE_FLAG_STRING(fuse_root_dir);
DECLARE_FLAG_BOOL(enable_root_path_collection);
DECLARE_FLAG_INT32(logtail_alarm_interval);
DECLARE_FLAG_BOOL(enable_containerd_upper_dir_detect);
DECLARE_FLAG_STRING(ALIYUN_LOG_FILE_TAGS);
DECLARE_FLAG_BOOL(enable_sls_metrics_format);
DECLARE_FLAG_BOOL(enable_new_pipeline);
1 change: 0 additions & 1 deletion core/go_pipeline/LogtailPlugin.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ LogtailPlugin::LogtailPlugin() {
mPluginCfg["LogtailSysConfDir"] = AppConfig::GetInstance()->GetLogtailSysConfDir();
mPluginCfg["HostIP"] = LogFileProfiler::mIpAddr;
mPluginCfg["Hostname"] = LogFileProfiler::mHostname;
mPluginCfg["EnableContainerdUpperDirDetect"] = BOOL_FLAG(enable_containerd_upper_dir_detect);
mPluginCfg["EnableSlsMetricsFormat"] = BOOL_FLAG(enable_sls_metrics_format);
}

Expand Down
1 change: 0 additions & 1 deletion core/logtail.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,6 @@ static void overwrite_community_edition_flags() {
STRING_FLAG(ilogtail_docker_file_path_config) = "checkpoint/docker_path_config.json";
INT32_FLAG(data_server_port) = 443;
BOOL_FLAG(enable_env_ref_in_config) = true;
BOOL_FLAG(enable_containerd_upper_dir_detect) = true;
BOOL_FLAG(enable_sls_metrics_format) = false;
}

Expand Down
1 change: 0 additions & 1 deletion core/logtail_windows.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@ static void overwrite_community_edition_flags() {
STRING_FLAG(ilogtail_docker_file_path_config) = "checkpoint/docker_path_config.json";
INT32_FLAG(data_server_port) = 443;
BOOL_FLAG(enable_env_ref_in_config) = true;
BOOL_FLAG(enable_containerd_upper_dir_detect) = true;
BOOL_FLAG(enable_sls_metrics_format) = false;
}

Expand Down
12 changes: 7 additions & 5 deletions docs/cn/installation/start-with-k8s.md
Original file line number Diff line number Diff line change
Expand Up @@ -206,12 +206,14 @@ wget https://raw.githubusercontent.com/alibaba/ilogtail/main/example_config/star
```
- name: logtail
command:
- /usr/local/ilogtail/ilogtail_control.sh
- /usr/local/ilogtail/ilogtail_control.sh
args:
- "start_and_block"
- "-enable_containerd_upper_dir_detect=true"
- "-dirfile_check_interval_ms=5000"
- "-logtail_checkpoint_check_gc_interval_sec=120"
- "start_and_block"
- "-dirfile_check_interval_ms=5000"
- "-logtail_checkpoint_check_gc_interval_sec=120"
env:
- name: enable_containerd_upper_dir_detect
value: "true"
```

应用上述配置
Expand Down
1 change: 0 additions & 1 deletion pkg/config/global_config.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ type GlobalConfig struct {
DelayStopSec int

EnableTimestampNanosecond bool
EnableContainerdUpperDirDetect bool
EnableSlsMetricsFormat bool
}

Expand Down
3 changes: 3 additions & 0 deletions pkg/flags/flags.go
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,8 @@ var DefaultRegion = flag.String("ALICLOUD_LOG_REGION", "", "default log region")

var SelfEnvConfigFlag bool

var EnableContainerdUpperDirDetect = flag.Bool("enable_containerd_upper_dir_detect", false, "if enable containerd upper dir detect when locating rootfs")

func init() {
_ = util.InitFromEnvBool("ALICLOUD_LOG_K8S_FLAG", K8sFlag, *K8sFlag)
_ = util.InitFromEnvBool("ALICLOUD_LOG_DOCKER_ENV_CONFIG", DockerConfigInitFlag, *DockerConfigInitFlag)
Expand All @@ -100,4 +102,5 @@ func init() {
if *DockerConfigInitFlag && *DockerConfigPluginInitFlag {
_ = util.InitFromEnvBool("ALICLOUD_LOG_DOCKER_ENV_CONFIG_SELF", &SelfEnvConfigFlag, false)
}
_ = util.InitFromEnvBool("enable_containerd_upper_dir_detect", EnableContainerdUpperDirDetect, *EnableContainerdUpperDirDetect)
}
4 changes: 2 additions & 2 deletions pkg/helper/docker_cri_adapter.go
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ import (
"google.golang.org/grpc"
cri "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"

"github.com/alibaba/ilogtail/pkg/config"
"github.com/alibaba/ilogtail/pkg/flags"
"github.com/alibaba/ilogtail/pkg/logger"
)

Expand Down Expand Up @@ -197,7 +197,7 @@ func NewCRIRuntimeWrapper(dockerCenter *DockerCenter) (*CRIRuntimeWrapper, error
}

var containerdClient *containerd.Client
if config.LogtailGlobalConfig.EnableContainerdUpperDirDetect {
if *flags.EnableContainerdUpperDirDetect {
containerdClient, err = containerd.New(containerdUnixSocket, containerd.WithDefaultNamespace("k8s.io"))
if err == nil {
_, err = containerdClient.Version(context.Background())
Expand Down

0 comments on commit 5c42010

Please sign in to comment.