DLPX-90130 update-package failed with a merge conflict in the drgn branch #59
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add the tools directory to the mypy pre-commit configuration. bpf_inspect.py has a bunch of mypy errors, so we'll opt it out for now. Signed-off-by: Omar Sandoval <[email protected]>
Signed-off-by: Omar Sandoval <[email protected]>
Signed-off-by: Omar Sandoval <[email protected]>
Signed-off-by: Omar Sandoval <[email protected]>
Now that we enable CONFIG_VIRTIO_BLK in our kconfig, there's no need to use a loop device. Configure a virtio-blk device in vmtest.vm so that the block helper tests have a disk to test with. Signed-off-by: Omar Sandoval <[email protected]>
My team and I have investigated many issues that turned out to be caused by a stray reference to a file or filesystem, either by user error or due to a kernel bug. Userspace tools like lsof and fuser can't find all of these. This adds a drgn-based tool similar to lsof/fuser. This initial version only checks the basics: file descriptors, task working directories, task root directories, task executables, and VMAs. Upcoming changes will check additional, more obscure places. Signed-off-by: Omar Sandoval <[email protected]>
Type units don't have a skeleton unit, so we need to walk over all of the units in the split DWARF file to find them. Instead of doing this in a second pass, rework drgn_dwarf_index_read_cus(): instead of substituting skeleton units with their respective split units, call drgn_dwarf_index_read_cus() recursively on the split DWARF file. Signed-off-by: Omar Sandoval <[email protected]>
My elfutils patches to support .dwp files were just merged and included in release 0.191. libdw does all of the heavy lifting, we just need to apply the section offsets when we parse DWARF ourselves. We still need to support older versions of elfutils, so add a stub. Closes osandov#317. Signed-off-by: Omar Sandoval <[email protected]>
Signed-off-by: Omar Sandoval <[email protected]>
manoj-joseph
force-pushed
the
dlpx/pr/manoj-joseph/48892f05-c3cb-4055-8705-c08b4c3b13f3
branch
from
df7d108
to
c7b95ca
Compare
manoj-joseph
force-pushed
the
dlpx/pr/manoj-joseph/48892f05-c3cb-4055-8705-c08b4c3b13f3
branch
2 times, most recently
from
ff88597
to
d623c34
Compare
manoj-joseph
changed the title
manoj-joseph
force-pushed
the
dlpx/pr/manoj-joseph/48892f05-c3cb-4055-8705-c08b4c3b13f3
branch
from
d623c34
to
ef0a651
Compare
jwk404
approved these changes
Mar 5, 2024
prakashsurya
approved these changes
Mar 6, 2024
manoj-joseph
deleted the
dlpx/pr/manoj-joseph/48892f05-c3cb-4055-8705-c08b4c3b13f3
branch
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Problem
Solution
Fixed the conflict by deleting
.pre-commit-config.yaml.Solution
http://selfservice.jenkins.delphix.com/job/github/job/delphix/job/drgn/job/appliance-build-orchestrator/job/pre-push/47/ failed in dx-tests.
http://selfservice.jenkins.delphix.com/job/dx-integration-tests/17204/ re-running dx-tests PASSED