-
Notifications
You must be signed in to change notification settings - Fork 280
Comparing changes
Open a pull request
base repository: microsoft/hcsshim
base: fc4f38d
head repository: microsoft/hcsshim
compare: 50b68e6
- 8 commits
- 26 files changed
- 4 contributors
Commits on May 2, 2022
-
Fix for linter issue on release/0.9 branch (#1385)
Signed-off-by: Ameya Gawde <agawde@mirantis.com>
Configuration menu - View commit details
-
Copy full SHA for 9c3e34e - Browse repository at this point
Copy the full SHA 9c3e34eView commit details -
Adding ExternalPortReserved flag to NatPolicy for HNS API V1. THis is…
… a flag exposed for docker to avoid port reservation conflict with external port (#1370) (#1373) HNS API V2 will use NatFlags to check and see if ExternalPortReserved is set (cherry picked from commit b85f3fd) Signed-off-by: Ameya Gawde <agawde@mirantis.com> Co-authored-by: Kendall Stratton <kestratt@microsoft.com> (cherry picked from commit dbb347e) Signed-off-by: Ameya Gawde <agawde@mirantis.com> Co-authored-by: Kendall Stratton <kestratt@microsoft.com>
Configuration menu - View commit details
-
Copy full SHA for 83e1852 - Browse repository at this point
Copy the full SHA 83e1852View commit details
Commits on May 18, 2022
-
Fix checkptr error with > 1 process in job object (#1284)
The `AllPids` method on JOBOBJECT_BASIC_PROCESS_ID_LIST would allocate a very large array to store any pids in the job object, cast the memory to this array, and then slice down to what elements it actually took up in the array based off the value of what was in the NumberOfProcessIdsInList field. The checkptr compile option doesn't like when slices don't have an explicit length and capacity so this change updates the slicing to use a three-index slice to set the capacity to the same as the length. Before for fmt.Println(len(arr), cap(arr)) -> 2, 134217727 After: -> 2, 2 This change additionally adds a test in internal/jobobject and modifies the TestExecWithJob test in internal/exec to verify that checkptr doesn't get angry when we hit a codepath that performs the cast Signed-off-by: Daniel Canter <dcanter@microsoft.com> (cherry picked from commit d082725) Signed-off-by: Daniel Canter <dcanter@microsoft.com>
Configuration menu - View commit details
-
Copy full SHA for 51a80ff - Browse repository at this point
Copy the full SHA 51a80ffView commit details -
Swap to fmt.Errorf in jobobject package (#1353)
* Swap to fmt.Errorf in jobobject package This change swaps to fmt.Errorf for wrapped errors in the jobobject package from errors.Wrap. We'd had talks of moving this code to winio where we've removed our pkg/errors dependency so this would make the port easier. Signed-off-by: Daniel Canter <dcanter@microsoft.com> (cherry picked from commit ccec73f) Signed-off-by: Daniel Canter <dcanter@microsoft.com>
Configuration menu - View commit details
-
Copy full SHA for dab144a - Browse repository at this point
Copy the full SHA dab144aView commit details
Commits on May 19, 2022
-
Replace winapi GetQueuedCompletionStatus bind with x/sys/windows (#1307)
Previously we had our own definition for GetQueuedCompletionStatus as x/sys/windows had an incorrect definition for it. This was remedied a bit ago in this change golang/sys@683adc9 so we're alright to remove our own at this point. Signed-off-by: Daniel Canter <dcanter@microsoft.com> (cherry picked from commit 4721411) Signed-off-by: Daniel Canter <dcanter@microsoft.com>
Configuration menu - View commit details
-
Copy full SHA for 5a70918 - Browse repository at this point
Copy the full SHA 5a70918View commit details -
wcow-process: Query Stats directly from shim (#1362)
This change adds in functionality to query statistics directly in the shim instead of reaching out to HCS. One of the main motivators behind this was poor performance for tallying up the private working set total for the container in HCS. HCS calls NtQuerySystemInformation with the class SystemProcessInformation which returns an array containing system information for every process running on the machine. They then grab the pids that are running in the container and filter down the entries in the array to only what's running in that silo and start tallying up the total. This doesn't work well as performance should get worse if more processes are running on the machine in general and not just in the container. All of the additional information besides the WorkingSetPrivateSize field is ignored as well which isn't great and is wasted work to fetch. HCS only let's you grab statistics in an all or nothing fashion, so we can't just grab the private working set ourselves and ask for everything else separately. We can open the silo ourselves and do the same queries for the rest of the info, as well as calculating the private working set in a more efficient manner by: 1. Find the pids running in the silo 2. Get a process handle for every process (only need PROCESS_QUERY_LIMITED_INFORMATION access) 3. Call NtQueryInformationProcess on each process with the class ProcessVmCounters 4. Tally up the total using the field PrivateWorkingSetSize in VM_COUNTERS_EX2. This change additionally: - Changes the jobcontainers package to use this new way to calculate the private working set. - Change the query the StorageStats method in the jobobject package uses to grab IO counters to match what HCS queries. Signed-off-by: Daniel Canter <dcanter@microsoft.com> (cherry picked from commit 4a1216a) Signed-off-by: Daniel Canter <dcanter@microsoft.com>
Configuration menu - View commit details
-
Copy full SHA for 063ce46 - Browse repository at this point
Copy the full SHA 063ce46View commit details -
Previous cherry-picked commits brought in changes from other commits that were not cherry-picked and these changes end up in /test/vendor because of our 'go mod vendor' flow. This just ensures our verify-test-vendor CI step will pass by re-vendoring what is actually present in the repo. Signed-off-by: Daniel Canter <dcanter@microsoft.com>
Configuration menu - View commit details
-
Copy full SHA for aad143f - Browse repository at this point
Copy the full SHA aad143fView commit details
Commits on May 20, 2022
-
Merge pull request #1403 from dcantah/cp-fixstats
[release/0.9] Query stats directly in-shim
Configuration menu - View commit details
-
Copy full SHA for 50b68e6 - Browse repository at this point
Copy the full SHA 50b68e6View commit details
This comparison is taking too long to generate.
Unfortunately it looks like we can’t render this comparison for you right now. It might be too big, or there might be something weird with your repository.
You can try running this command locally to see the comparison on your machine:
git diff fc4f38d...50b68e6