Skip to content

feat: 移除ipwatchd插件 - #52

Merged
deepin-bot[bot] merged 1 commit into
linuxdeepin:masterfrom
fly602:master
Jan 14, 2026
Merged

deepin-bot[bot] merged 1 commit into
linuxdeepin:masterfrom
fly602:master

Conversation

@fly602

@fly602 fly602 commented Jan 13, 2026 •

Copy link
Copy Markdown
Contributor

由于ipwatchd会导致io占用高, 移除IPwatchd

Log: 移除ipwatchd插件
PMS: BUG—339237
Influence: ip冲突检测

Summary by Sourcery

Build:

  • Turn off the ENABLE_PLUGIN_IPWATCHD CMake option so the ipwatchd plugin is no longer built.

@sourcery-ai

sourcery-ai Bot commented Jan 13, 2026

Copy link
Copy Markdown
Reviewer's guide (collapsed on small PRs)

Reviewer's Guide

Disables building the ipwatchd D-Bus plugin by default to remove the ip conflict detection plugin that was causing high IO usage.

File-Level Changes

Change Details Files
Disable the ipwatchd plugin from being built by default while keeping the conditional build logic intact.
  • Change the ENABLE_PLUGIN_IPWATCHD CMake option default from ON to OFF
  • Retain the conditional add_subdirectory call so the plugin can still be built if explicitly enabled
src/plugin-sdbus/CMakeLists.txt

Tips and commands

Interacting with Sourcery

  • Trigger a new review: Comment @sourcery-ai review on the pull request.
  • Continue discussions: Reply directly to Sourcery's review comments.
  • Generate a GitHub issue from a review comment: Ask Sourcery to create an
    issue from a review comment by replying to it. You can also reply to a
    review comment with @sourcery-ai issue to create an issue from it.
  • Generate a pull request title: Write @sourcery-ai anywhere in the pull
    request title to generate a title at any time. You can also comment
    @sourcery-ai title on the pull request to (re-)generate the title at any time.
  • Generate a pull request summary: Write @sourcery-ai summary anywhere in
    the pull request body to generate a PR summary at any time exactly where you
    want it. You can also comment @sourcery-ai summary on the pull request to
    (re-)generate the summary at any time.
  • Generate reviewer's guide: Comment @sourcery-ai guide on the pull
    request to (re-)generate the reviewer's guide at any time.
  • Resolve all Sourcery comments: Comment @sourcery-ai resolve on the
    pull request to resolve all Sourcery comments. Useful if you've already
    addressed all the comments and don't want to see them anymore.
  • Dismiss all Sourcery reviews: Comment @sourcery-ai dismiss on the pull
    request to dismiss all existing Sourcery reviews. Especially useful if you
    want to start fresh with a new review - don't forget to comment
    @sourcery-ai review to trigger a new review!

Customizing Your Experience

Access your dashboard to:

  • Enable or disable review features such as the Sourcery-generated pull request
    summary, the reviewer's guide, and others.
  • Change the review language.
  • Add, remove or edit custom review instructions.
  • Adjust other review settings.

Getting Help

@sourcery-ai sourcery-ai Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hey - I've reviewed your changes and they look great!


Sourcery is free for open source - if you like our reviews please consider sharing them ✨
Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.

由于ipwatchd会导致io占用高, 移除IPwatchd

Log: 移除ipwatchd插件
PMS: BUG—339237
Influence: ip冲突检测
@deepin-ci-robot

Copy link
Copy Markdown

deepin pr auto review

这段代码的 git diff 显示了对 src/plugin-sdbus/CMakeLists.txt 文件的两处修改。以下是对这两处修改的详细审查意见,涵盖逻辑、质量、性能和安全等方面:

1. 版权年份修改

修改内容:

-# SPDX-FileCopyrightText: 2023 UnionTech Software Technology Co., Ltd.
+# SPDX-FileCopyrightText: 2026 UnionTech Software Technology Co., Ltd.

审查意见:

  • 逻辑与合规性(重要): 将年份从 2023 修改为 2026 是不合理的。
    • 版权声明中的年份通常表示该代码首次发布或最后修改的年份。除非这是一个针对未来发布的特定版本分支,否则将年份设置为未来的 2026 年是不合逻辑的。
    • 如果这是为了表示"有效期至 2026",那么 SPDX 标签通常不用于此目的,应查看具体的许可证协议。
  • 建议: 请确认年份是否为笔误。如果是当前修改,应保持为 2023 或改为当前年份(如 2024)。如果是维护旧代码,通常保留原始年份。

2. 编译选项默认值修改

修改内容:

-option(ENABLE_PLUGIN_IPWATCHD "Build plugin-ipwatchd" ON)
+option(ENABLE_PLUGIN_IPWATCHD "Build plugin-ipwatchd" OFF)

审查意见:

  • 语法与逻辑: 语法正确。逻辑上,这意味着该插件(plugin-ipwatchd)默认将不再被编译。
  • 代码质量与影响分析:
    • 破坏性变更: 将默认值从 ON 改为 OFF 是一个破坏性变更。如果下游用户或自动化构建系统依赖于该插件默认开启,这个修改会导致构建出的系统缺失该功能(IP 监控),可能导致运行时功能缺失。
    • 模块化/裁剪: 如果意图是减小默认构建体积,或者该插件功能不再被推荐使用,这个修改是合理的。
  • 性能:
    • 构建性能: 默认关闭该选项可以加快默认构建速度,减少编译产物体积。
    • 运行时性能: 不编译该插件意味着系统将不会加载该模块,从而减少潜在的内存占用和后台进程开销。
  • 安全性:
    • 攻击面: 如果该插件存在潜在的安全漏洞,或者不再被积极维护,默认关闭它可以减少系统的攻击面,这是一种安全加固措施。

综合改进建议

  1. 修正版权年份: 务必将版权年份修正为当前实际年份或代码创建年份,不要使用未来年份。
  2. 评估关闭默认值的影响:
    • 如果 plugin-ipwatchd 是核心功能(例如网络监控),建议保持 ON 或在变更日志中明确通知用户需要手动开启。
    • 如果该插件是可选的或实验性的,改为 OFF 是合理的。
  3. 文档同步: 修改默认编译选项后,请同步更新项目的构建文档(README 或 BUILDING.md),说明该插件已被默认禁用以及如何重新启用它。

修正后的代码建议:

# SPDX-FileCopyrightText: 2023-2024 UnionTech Software Technology Co., Ltd.
#
# SPDX-License-Identifier: LGPL-3.0-or-later

# 如果该功能非核心或为了减小默认构建体积,设为 OFF 是合理的
# 但请确保相关文档已更新
option(ENABLE_PLUGIN_IPWATCHD "Build plugin-ipwatchd" OFF)

if (ENABLE_PLUGIN_IPWATCHD)
    add_subdirectory("plugin-ipwatchd")

@deepin-ci-robot

Copy link
Copy Markdown

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: fly602, robertkill

The full list of commands accepted by this bot can be found here.

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@fly602

fly602 commented Jan 14, 2026

Copy link
Copy Markdown
Contributor Author

/forcemerge

@deepin-bot

deepin-bot Bot commented Jan 14, 2026

Copy link
Copy Markdown

This pr force merged! (status: blocked)

@deepin-bot
deepin-bot Bot merged commit 9e67028 into linuxdeepin:master Jan 14, 2026
7 of 8 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants