Merge dev into ww21_PR_shm with conflict-safe SHM preservation

[Copilot]

This PR resolves the non-UI merge conflicts blocking PR #301 by integrating dev into ww21_PR_shm and reconciling the diverged multiprocess refactor + SHM work.
Resolution favors dev’s current architecture while retaining SHM-specific behavior from ww21_PR_shm.

• Architecture alignment (preferred from dev)

  • Kept the compositor/module-based multiprocess server shape (engine_context / engine_module / modules/* flow).
  • Kept the blend_server_v2 → modules/blend.py module layout and related handler/test target updates.
  • Preserved MPServerConfig.transfer_mode-driven module selection semantics.

• SHM behavior preservation (from ww21_PR_shm)

  • Retained SHM-specific transfer/config behavior that does not exist in dev.
  • Preserved non-GPU SHM configuration path, including shm_name override wiring in cache server startup.

• Conflict hotspots reconciled

  • lmcache/v1/multiprocess/server.py
  • tests/v1/multiprocess/test_non_cuda_data_transfer.py
  • Result keeps dev’s modern server structure while preserving SHM-specific branch behavior.

# server startup keeps explicit SHM override semantics
if mp_config.shm_name is not None:
    storage_manager_config.l1_manager_config.memory_config.shm_name = (
        mp_config.shm_name
    )

Original prompt

Goal

PR #301 (ww21_PR_shm → dev) currently has merge conflicts that cannot be resolved in the GitHub web UI. Fix the ww21_PR_shm branch so it can be cleanly merged into dev.

What to do

1. Create a branch from ww21_PR_shm

2. Merge dev into it, resolving all conflicts

3. The key conflicting areas based on the dev diff are likely in:

   • lmcache/v1/multiprocess/server.py (dev refactored into compositor pattern with modules under modules/)
   • lmcache/v1/multiprocess/config.py (dev added transfer_mode field)
   • lmcache/v1/multiprocess/blend_server_v2.py (dev renamed/moved to modules/blend.py)
   • Test files that changed mock targets (e.g. tests/v1/multiprocess/test_free_locks.py, test_query_lookup_hits.py, test_non_cuda_data_transfer.py, test_blend_server_v2.py)
   • lmcache/v1/config.py, lmcache/observability.py, lmcache/v1/memory_management.py

4. When resolving conflicts, prefer dev's version for:

   • The compositor/module architecture (engine_context.py, engine_module.py, modules/ directory)
   • PrometheusLogger multi-instance changes
   • Hugepage support additions
   • New GPU KV formats (HND variants)
   • hipfile shim, io_uring epoll changes
   • Operator kv_connector_module_path additions
   • All new files from dev

5. Preserve from ww21_PR_shm:

   • SHM transfer logic and any SHM-specific code that doesn't exist in dev
   • Any SHM-specific configuration fields
   • Any SHM-specific test files

6. Open the PR targeting ww21_PR_shm so the user can merge it, which will make PR ww21_shm #301 conflict-free.

The following is the prior conversation context from the user's chat exploration (may be truncated):

User: 但是本地merge有很多conflict我不知道怎么解决怎么办

Assistant: 这就是 PR #300 存在的意义——冲突已经被 Copilot agent 解决好了。

你不需要自己处理任何 conflict，直接在 GitHub 上点 Merge 就行。PR 虽然 diff 很大，但那是因为 dev 积累了很多改动，冲突部分 agent 已经替你选好了正确的版本：

• dev 的新架构（compositor/modules）→ 保留
• 你的 SHM 逻辑 → 保留
• 两边都改的文件 → 已合并

操作步骤：

1. 去 PR #300 点 Merge
2. 然后回到 PR #299，它应该就能正常 rebase 了

如果你想先确认 agent 解决冲突的质量，可以看看 PR #300 里改动的文件，特别是 server.py 和测试文件那几个冲突点。

User: 要不我先accept both把dev合进来，然后你再修，这样行吗

Assistant: 可以是可以，但没必要——PR #300 已经帮你做完了这件事，而且解决得比 "accept both" 更干净。

"Accept both" 的问题是：

• 会留下重复的 import、重复的函数定义、语法错误
• 你 push 上来之后我再修，等于又要开一个 PR，多绕一圈

最简单的路径就是直接合 PR #300。它就是 "merge dev + 正确解决冲突" 的结果，不会引入任何新功能，只是让你的分支追上 dev。

你去点一下 merge 就好了：#300

User: 但是签名不对，我只能用自己的签名

Assistant: 明白了，repo 要求 Signed-off-by 用你自己的签名。

最简单的办法：本地拉下来 merge，用你的签名 push：

# 拉取 PR #300 的分支
git fetch origin copilot/fix-300
git checkout ww21_PR_shm

# 合并（冲突已经在那个分支上解决好了，所以不会有 conflict）
git merge origin/copilot/fix-300 --signoff -m "Merge dev into ww21_PR_shm"

# push
git push origin ww21_PR_shm

这样 merge commit 是你的签名，内容是 agent 已经解决好冲突的结果，你不需要手动处理任何 conflict。

然后关掉 PR #300 就行了。

User: root@b60-8-hq-1:~/hlin76/LMCache# git fetch origin copilot/fix-300
fatal: couldn't find remote ref copilot/fix-300

Assistant: 分支名是 copilot/ww21-pr-shm-merge-dev，用这个：

git fetch origin copilot/ww21-pr-shm-merge-dev
git checkout ww21_PR_shm
git merge origin/copilot/ww21-pr-shm-merge-dev --signoff -m "Merge dev into ww21_PR_shm"
git push origin ww21_PR_shm

这样 commit 带的是你的签名，冲突已经在那个分支里解决好了，不会有 conflict。

User: 这样还是不行

Assistant: 试试这个方法——直接 merge dev，用 copilot 分支的结果来解决冲突：

git checkout ww21_PR_shm
git fetch origin

# 开始 merge dev（会报 conflict）
git merge origin/dev --signoff

# 用 copilot 已解决好的文件覆盖所有冲突
git checkout origin/copilot/ww21-pr-shm-merge-dev -- .
git add .

# 完成 merge commit（带你的签名）
git commit --signoff

git push origin ww21_PR_shm

这样：

• merge commit 是你的签名 ✓
• 冲突用 agent 解决好的版本 ✓
• 历史记录是干净的 Merge branch 'dev' ✓

User: git checkout origin/copilot/ww21-pr-shm-merge-dev -- .
git add .
这个命令什么意思

Assistant: - git checkout origin/copilot/ww21-pr-shm-merge-dev -- .

把工作目录里所有文件替换成 copilot 分支上的版本（那个分支已经解决好了所有冲突）。-- 后面的 . 表示当前目录下所有文件。相当于"用已经解好冲突的结果覆盖本地"。

• git add .

  把这些改动标记为"冲突已解决"，准备提交。

合在一起的效果就是：你不用手动处理任何 conflict，直接用 agent 帮你解好的文件一次性替换掉所有冲突文件。

User: ```
commit 146e2acd765291c3c0274f6e7ce93b06fb37c133 (HEAD -> ww21_PR_shm)
Merge: c61c215 bd713b5
Author: Tony Lin tony.lin@intel.com
Date: Wed May 27 02:08:50 2026 +0000

Merge remote-tracking branch 'origin/dev' into ww21_PR_shm

Signed-off-by: Tony Lin <tony.lin@intel.com>

commit bd713b5 (origin/dev, origin/HEAD)
Author: weizhoublue 45163302+weizhoublue@users.noreply.github.com
Date: Wed May 27 07:26:22 2026 +0800

fix: prevent TypeError crash when streaming response has zero visible content (#3258)

Signed-off-by: weizhou.lan@daocloud.io <weizhou.lan@daocloud.io>

commit 1b8785a
Author: Kihwan Kim luceinaltis2020@gmail.com
Date: Wed May 27 08:02:34 2026 +0900

[Bugfix] Fix 0-hit asy...

This pull request was created from Copilot chat.