-
Notifications
You must be signed in to change notification settings - Fork 1.8k
[https://nvbugs/5498165][fix] fix permission error for config file lock #7656
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Conversation
8859d2e to
9085871
Compare
|
/bot run |
📝 WalkthroughWalkthroughIntroduces a secondary locking strategy in config_file_lock: if acquiring the primary lock under HF_MODULES_CACHE fails due to PermissionError/OSError, attempts a temp-dir lock via tempfile.gettempdir(). On timeouts or errors with the temp lock, logs warnings and proceeds without a lock. Primary path behavior otherwise unchanged. Changes
Sequence Diagram(s)sequenceDiagram
autonumber
participant Caller
participant config_file_lock
participant PrimaryLock as HF_CACHE/_remote_code.lock
participant TempLock as TMP/_remote_code.lock
Caller->>config_file_lock: enter context
config_file_lock->>PrimaryLock: try acquire
alt acquired
Note over config_file_lock,PrimaryLock: Use primary lock
else PermissionError/OSError
Note over config_file_lock: Primary lock access error
config_file_lock->>TempLock: try acquire in temp dir
alt acquired
Note over config_file_lock,TempLock: Using temp-dir lock
else Timeout
Note over config_file_lock: Warn: temp lock timeout
Note over Caller,config_file_lock: Proceed without lock
else PermissionError/OSError
Note over config_file_lock: Warn with exception
Note over Caller,config_file_lock: Proceed without lock
end
else Timeout
Note over config_file_lock: Warn: primary lock timeout
Note over Caller,config_file_lock: Proceed without lock
end
Caller-->>config_file_lock: exit context (release if held)
Estimated code review effort🎯 2 (Simple) | ⏱️ ~10 minutes Pre-merge checks (2 passed, 1 warning)❌ Failed checks (1 warning)
✅ Passed checks (2 passed)
Tip 👮 Agentic pre-merge checks are now available in preview!Pro plan users can now enable pre-merge checks in their settings to enforce checklists before merging PRs.
Example: reviews:
pre_merge_checks:
custom_checks:
- name: "Undocumented Breaking Changes"
mode: "warning"
instructions: |
Pass/fail criteria: All breaking changes to public APIs, CLI flags, environment variables, configuration keys, database schemas, or HTTP/GraphQL endpoints must be documented in the "Breaking Change" section of the PR description and in CHANGELOG.md. Exclude purely internal or private changes (e.g., code not exported from package entry points or explicitly marked as internal).Please share your feedback with us on this Discord post. ✨ Finishing Touches
🧪 Generate unit tests
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
|
PR_Github #18254 [ run ] triggered by Bot |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Actionable comments posted: 1
🧹 Nitpick comments (4)
tensorrt_llm/_torch/model_config.py (4)
14-20: Deduplicate logger imports.Two imports bring in the same symbol; keep one to avoid confusion.
-from tensorrt_llm import logger from tensorrt_llm._torch.pyexecutor.config_utils import is_nemotron_hybrid ... -from tensorrt_llm.logger import logger +from tensorrt_llm.logger import logger
66-75: Docstring is outdated—document fallback and no-lock behavior.Reflect the new tempdir fallback and proceed-without-lock path.
- """ - Context manager for file locking when loading pretrained configs. - - This prevents race conditions when multiple processes try to download/load - the same model configuration simultaneously. - - Args: - timeout: Maximum time to wait for lock acquisition in seconds - """ + """ + Context manager for file locking when loading pretrained configs. + + Primary lock: HF_MODULES_CACHE/_remote_code.lock. + Fallback: on PermissionError/OSError, use tempfile.gettempdir()/_remote_code.lock. + On Timeout at either location, or if both are unavailable, proceed without a lock (warn). + + Args: + timeout: Maximum seconds to wait for lock acquisition. + """
86-91: Include lock path in the timeout warning.Improves observability during contention.
- except filelock.Timeout: - logger.warning( - f"Failed to acquire config lock within {timeout} seconds, proceeding without lock" - ) + except filelock.Timeout: + logger.warning( + f"Failed to acquire config lock at {lock_path} within {timeout} seconds, proceeding without lock" + )
103-111: Clarify fallback warnings; include path and exception class.More actionable logs; avoid implying only permission errors.
- except filelock.Timeout: - logger.warning( - f"Failed to acquire tempdir config lock within {timeout} seconds, proceeding without lock" - ) + except filelock.Timeout: + logger.warning( + f"Failed to acquire tempdir config lock at {lock_path} within {timeout} seconds, proceeding without lock" + ) ... - except (PermissionError, OSError) as e: - logger.warning( - f"HF_MODULES_CACHE and tempdir config lock unavailable due to permission error: {e}, proceeding without lock" - ) + except (PermissionError, OSError) as e: + logger.warning( + f"HF_MODULES_CACHE and tempdir config locks unavailable due to {e.__class__.__name__}: {e}; proceeding without lock" + )
📜 Review details
Configuration used: Path: .coderabbit.yaml
Review profile: CHILL
Plan: Pro
📒 Files selected for processing (1)
tensorrt_llm/_torch/model_config.py(2 hunks)
🧰 Additional context used
📓 Path-based instructions (3)
**/*.{h,hpp,hh,hxx,cpp,cxx,cc,cu,cuh,py}
📄 CodeRabbit inference engine (CODING_GUIDELINES.md)
Use only spaces, no tabs; indent with 4 spaces.
Files:
tensorrt_llm/_torch/model_config.py
**/*.py
📄 CodeRabbit inference engine (CODING_GUIDELINES.md)
**/*.py: Python code must target Python 3.8+.
Indent Python code with 4 spaces; do not use tabs.
Maintain module namespace when importing; prefer 'from package.subpackage import foo' then 'foo.SomeClass()' instead of importing the class directly.
Python filenames should be snake_case (e.g., some_file.py).
Python classes use PascalCase names.
Functions and methods use snake_case names.
Local variables use snake_case; prefix 'k' for variables that start with a number (e.g., k_99th_percentile).
Global variables use upper SNAKE_CASE prefixed with 'G' (e.g., G_MY_GLOBAL).
Constants use upper SNAKE_CASE (e.g., MY_CONSTANT).
Avoid shadowing variables from an outer scope.
Initialize all externally visible members of a class in the constructor.
Prefer docstrings for interfaces that may be used outside a file; comments for in-function or file-local interfaces.
Use Google-style docstrings for classes and functions (Sphinx-parsable).
Document attributes and variables inline so they render under the class/function docstring.
Avoid reflection when a simpler, explicit approach suffices (e.g., avoid dict(**locals()) patterns).
In try/except, catch the most specific exceptions possible.
For duck-typing try/except, keep the try body minimal and use else for the main logic.
Files:
tensorrt_llm/_torch/model_config.py
**/*.{cpp,cxx,cc,h,hpp,hh,hxx,cu,cuh,py}
📄 CodeRabbit inference engine (CODING_GUIDELINES.md)
Prepend the NVIDIA Apache-2.0 copyright header with current year to the top of all source files (e.g., .cpp, .h, .cu, .py).
Files:
tensorrt_llm/_torch/model_config.py
🧬 Code graph analysis (1)
tensorrt_llm/_torch/model_config.py (1)
tensorrt_llm/logger.py (1)
warning(132-133)
⏰ Context from checks skipped due to timeout of 90000ms. You can increase the timeout in your CodeRabbit configuration to a maximum of 15 minutes (900000ms). (1)
- GitHub Check: Pre-commit Check
🔇 Additional comments (2)
tensorrt_llm/_torch/model_config.py (2)
4-4: Import for tempfile is appropriate.Needed for the fallback lock path.
92-92: Catching OSError broadly—confirm intent.Catching OSError may hide disk/full/IO failures unrelated to permissions. If the goal is strictly permission issues, consider narrowing to (PermissionError, FileNotFoundError). Otherwise, keep as-is and rely on warnings.
|
PR_Github #18254 [ run ] completed with state |
|
/bot run --reuse-test |
|
PR_Github #18261 [ run ] triggered by Bot |
|
PR_Github #18261 [ run ] completed with state |
9085871 to
ffa5778
Compare
|
/bot run |
|
PR_Github #18266 [ run ] triggered by Bot |
|
PR_Github #18266 [ run ] completed with state |
|
/bot run --reuse-test |
|
PR_Github #18292 [ run ] triggered by Bot |
|
PR_Github #18292 [ run ] completed with state |
|
/bot run --reuse-test |
|
PR_Github #18312 [ run ] triggered by Bot |
|
PR_Github #18312 [ run ] completed with state |
ffa5778 to
0a843ac
Compare
|
/bot run |
|
PR_Github #18317 [ run ] triggered by Bot |
|
PR_Github #18317 [ run ] completed with state |
|
/bot run |
|
PR_Github #18332 [ run ] triggered by Bot |
|
PR_Github #18332 [ run ] completed with state |
Signed-off-by: Chang Liu <9713593+chang-l@users.noreply.github.com>
0a843ac to
8afdd20
Compare
|
/bot run |
|
PR_Github #18380 [ run ] triggered by Bot |
|
PR_Github #18380 [ run ] completed with state |
…ck (NVIDIA#7656) Signed-off-by: Chang Liu <9713593+chang-l@users.noreply.github.com>
…ck (NVIDIA#7656) Signed-off-by: Chang Liu <9713593+chang-l@users.noreply.github.com>
Summary by CodeRabbit
Description
Test Coverage
PR Checklist
Please review the following before submitting your PR:
PR description clearly explains what and why. If using CodeRabbit's summary, please make sure it makes sense.
PR Follows TRT-LLM CODING GUIDELINES to the best of your knowledge.
Test cases are provided for new code paths (see test instructions)
Any new dependencies have been scanned for license and vulnerabilities
CODEOWNERS updated if ownership changes
Documentation updated as needed
The reviewers assigned automatically/manually are appropriate for the PR.
Please check this after reviewing the above items as appropriate for this PR.
GitHub Bot Help
/bot [-h] ['run', 'kill', 'skip', 'reuse-pipeline'] ...Provide a user friendly way for developers to interact with a Jenkins server.
Run
/bot [-h|--help]to print this help message.See details below for each supported subcommand.
run [--reuse-test (optional)pipeline-id --disable-fail-fast --skip-test --stage-list "A10-PyTorch-1, xxx" --gpu-type "A30, H100_PCIe" --test-backend "pytorch, cpp" --add-multi-gpu-test --only-multi-gpu-test --disable-multi-gpu-test --post-merge --extra-stage "H100_PCIe-TensorRT-Post-Merge-1, xxx" --detailed-log --debug(experimental)]Launch build/test pipelines. All previously running jobs will be killed.
--reuse-test (optional)pipeline-id(OPTIONAL) : Allow the new pipeline to reuse build artifacts and skip successful test stages from a specified pipeline or the last pipeline if no pipeline-id is indicated. If the Git commit ID has changed, this option will be always ignored. The DEFAULT behavior of the bot is to reuse build artifacts and successful test results from the last pipeline.--disable-reuse-test(OPTIONAL) : Explicitly prevent the pipeline from reusing build artifacts and skipping successful test stages from a previous pipeline. Ensure that all builds and tests are run regardless of previous successes.--disable-fail-fast(OPTIONAL) : Disable fail fast on build/tests/infra failures.--skip-test(OPTIONAL) : Skip all test stages, but still run build stages, package stages and sanity check stages. Note: Does NOT update GitHub check status.--stage-list "A10-PyTorch-1, xxx"(OPTIONAL) : Only run the specified test stages. Examples: "A10-PyTorch-1, xxx". Note: Does NOT update GitHub check status.--gpu-type "A30, H100_PCIe"(OPTIONAL) : Only run the test stages on the specified GPU types. Examples: "A30, H100_PCIe". Note: Does NOT update GitHub check status.--test-backend "pytorch, cpp"(OPTIONAL) : Skip test stages which don't match the specified backends. Only support [pytorch, cpp, tensorrt, triton]. Examples: "pytorch, cpp" (does not run test stages with tensorrt or triton backend). Note: Does NOT update GitHub pipeline status.--only-multi-gpu-test(OPTIONAL) : Only run the multi-GPU tests. Note: Does NOT update GitHub check status.--disable-multi-gpu-test(OPTIONAL) : Disable the multi-GPU tests. Note: Does NOT update GitHub check status.--add-multi-gpu-test(OPTIONAL) : Force run the multi-GPU tests in addition to running L0 pre-merge pipeline.--post-merge(OPTIONAL) : Run the L0 post-merge pipeline instead of the ordinary L0 pre-merge pipeline.--extra-stage "H100_PCIe-TensorRT-Post-Merge-1, xxx"(OPTIONAL) : Run the ordinary L0 pre-merge pipeline and specified test stages. Examples: --extra-stage "H100_PCIe-TensorRT-Post-Merge-1, xxx".--detailed-log(OPTIONAL) : Enable flushing out all logs to the Jenkins console. This will significantly increase the log volume and may slow down the job.--debug(OPTIONAL) : Experimental feature. Enable access to the CI container for debugging purpose. Note: Specify exactly one stage in thestage-listparameter to access the appropriate container environment. Note: Does NOT update GitHub check status.For guidance on mapping tests to stage names, see
docs/source/reference/ci-overview.mdand the
scripts/test_to_stage_mapping.pyhelper.kill
killKill all running builds associated with pull request.
skip
skip --comment COMMENTSkip testing for latest commit on pull request.
--comment "Reason for skipping build/test"is required. IMPORTANT NOTE: This is dangerous since lack of user care and validation can cause top of tree to break.reuse-pipeline
reuse-pipelineReuse a previous pipeline to validate current commit. This action will also kill all currently running builds associated with the pull request. IMPORTANT NOTE: This is dangerous since lack of user care and validation can cause top of tree to break.