Refactors the TasksService requires per platform#2523
Refactors the TasksService requires per platform#2523dmcgowan merged 1 commit intocontainerd:masterfrom
Conversation
Removes the start dependency on V1 runtimes in the TasksService for: // +build windows_v2. For unix and windows (v1) this code remains to load all v1 runtimes as expected. Signed-off-by: Justin Terry (VM) <[email protected]>
|
@crosbymichael - This is what we talked about. Removes the dependency on the Windows V2 work to have a V1 runtime present on start. Eventually once windows (v1) is removed the |
Codecov Report
@@ Coverage Diff @@
## master #2523 +/- ##
=======================================
Coverage 45.07% 45.07%
=======================================
Files 93 93
Lines 9780 9780
=======================================
Hits 4408 4408
Misses 4654 4654
Partials 718 718
Continue to review full report at Codecov.
|
| @@ -0,0 +1,56 @@ | |||
| // +build !windows_v2 | |||
There was a problem hiding this comment.
is windows_v2 being used here for shorthand that it imples !windows; assuming that a Makefile section at some point marries the BUILDTAG addition of windows_v2 to only be turned on when GOOS=windows?
I only ask because in your windows source file you were explicit to join windows and windows_v2. Not a big deal, but curious as maybe they should both use the same strategy, even though I think build-time constraints will most likely make it immaterial.
There was a problem hiding this comment.
@estesp - Actually, in this case local_unix.go is confusing. This really is local_all.go where all is everything that exists today !windows_v2. I named it this way though because when Windows v1 is removed this would be only for Unix. You can see in Makefile.windows#L30 the following:
ifeq (${BUILD_WINDOWS_V2},1)
BUILDTAGS += windows_v2
endifSo windows_v2 is really GOOS=windows and an additional tag -tags windows_v2. It is used to flip/flop between the Windows runtime v1 service and the new runtime v2 TasksService while the implementation is completed. Then the Windows v1 runtime will be removed.
|
LGTM |
1 similar comment
|
LGTM |
5 participants
Removes the start dependency on V1 runtimes in the TasksService for:
// +build windows_v2. For unix and windows (v1) this code remains to load all
v1 runtimes as expected.
Signed-off-by: Justin Terry (VM) [email protected]