-
Notifications
You must be signed in to change notification settings - Fork 37
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat(controller): build dataset in server (#2497)
- Loading branch information
1 parent
130d048
commit 7c7ff4f
Showing
48 changed files
with
1,894 additions
and
95 deletions.
There are no files selected for viewing
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
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
125 changes: 125 additions & 0 deletions
125
server/controller/src/main/java/ai/starwhale/mlops/api/DatasetBuildLogWsServer.java
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,125 @@ | ||
| /* | ||
| * Copyright 2022 Starwhale, Inc. All Rights Reserved. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package ai.starwhale.mlops.api; | ||
|
|
||
| import ai.starwhale.mlops.common.IdConverter; | ||
| import ai.starwhale.mlops.schedule.k8s.log.CancellableJobLogCollector; | ||
| import ai.starwhale.mlops.schedule.k8s.log.CancellableJobLogK8sCollectorFactory; | ||
| import io.kubernetes.client.openapi.ApiException; | ||
| import java.io.IOException; | ||
| import java.util.concurrent.ExecutorService; | ||
| import java.util.concurrent.Executors; | ||
| import javax.websocket.OnClose; | ||
| import javax.websocket.OnError; | ||
| import javax.websocket.OnMessage; | ||
| import javax.websocket.OnOpen; | ||
| import javax.websocket.Session; | ||
| import javax.websocket.server.PathParam; | ||
| import javax.websocket.server.ServerEndpoint; | ||
| import lombok.extern.slf4j.Slf4j; | ||
| import org.springframework.beans.factory.annotation.Autowired; | ||
| import org.springframework.stereotype.Component; | ||
|
|
||
| @Component | ||
| @Slf4j | ||
| @ServerEndpoint("/api/v1/log/online/dataset/{name}/build/{id}") | ||
| public class DatasetBuildLogWsServer { | ||
|
|
||
| private static final ExecutorService executorService = Executors.newCachedThreadPool(); | ||
|
|
||
| private static IdConverter idConvertor; | ||
|
|
||
| private static CancellableJobLogK8sCollectorFactory logCollectorFactory; | ||
|
|
||
| private Session session; | ||
|
|
||
| private String readerId; | ||
|
|
||
| private Long id; | ||
|
|
||
| private CancellableJobLogCollector logCollector; | ||
|
|
||
|
|
||
| @Autowired | ||
| public void setIdConvertor(IdConverter idConvertor) { | ||
| DatasetBuildLogWsServer.idConvertor = idConvertor; | ||
| } | ||
|
|
||
| @Autowired | ||
| public void setLogCollectorFactory(CancellableJobLogK8sCollectorFactory factory) { | ||
| DatasetBuildLogWsServer.logCollectorFactory = factory; | ||
| } | ||
|
|
||
| @OnOpen | ||
| public void onOpen(Session session, @PathParam("name") String name, @PathParam("id") String id) { | ||
| this.session = session; | ||
| this.readerId = session.getId(); | ||
| this.id = idConvertor.revert(id); | ||
| try { | ||
| logCollector = logCollectorFactory.make(String.format("%s-%s", name, id)); | ||
| } catch (IOException | ApiException e) { | ||
| log.error("make k8s log collector failed", e); | ||
| } | ||
| log.info("Build log ws opened. reader={}, task={}", readerId, id); | ||
| executorService.submit(() -> { | ||
| String line; | ||
| while (true) { | ||
| try { | ||
| if ((line = logCollector.readLine()) == null) { | ||
| break; | ||
| } | ||
| sendMessage(line); | ||
| } catch (IOException e) { | ||
| log.error("read k8s log failed", e); | ||
| break; | ||
| } | ||
| } | ||
| }); | ||
| } | ||
|
|
||
| @OnClose | ||
| public void onClose() { | ||
| cancelLogCollector(); | ||
| log.info("Build log ws closed. reader={}, task={}", readerId, id); | ||
| } | ||
|
|
||
| @OnMessage | ||
| public void onMessage(String message, Session session) { | ||
|
|
||
| } | ||
|
|
||
| @OnError | ||
| public void onError(Session session, Throwable error) { | ||
| cancelLogCollector(); | ||
| log.error("Task log ws error: reader={}, task={}, message={}", readerId, id, error.getMessage()); | ||
| } | ||
|
|
||
| public void sendMessage(String message) { | ||
| try { | ||
| this.session.getBasicRemote().sendText(message); | ||
| } catch (IOException e) { | ||
| log.error("ws send message", e); | ||
| } | ||
| } | ||
|
|
||
| private void cancelLogCollector() { | ||
| if (logCollector != null) { | ||
| logCollector.cancel(); | ||
| logCollector = null; | ||
| } | ||
| } | ||
| } |
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
59 changes: 59 additions & 0 deletions
59
server/controller/src/main/java/ai/starwhale/mlops/api/FileStorageApi.java
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,59 @@ | ||
| /* | ||
| * Copyright 2022 Starwhale, Inc. All Rights Reserved. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package ai.starwhale.mlops.api; | ||
|
|
||
| import ai.starwhale.mlops.api.protocol.ResponseMessage; | ||
| import ai.starwhale.mlops.api.protocol.filestorage.ApplySignedUrlRequest; | ||
| import ai.starwhale.mlops.api.protocol.filestorage.FileDeleteRequest; | ||
| import ai.starwhale.mlops.api.protocol.filestorage.SignedUrlResponse; | ||
| import io.swagger.v3.oas.annotations.Operation; | ||
| import io.swagger.v3.oas.annotations.responses.ApiResponse; | ||
| import io.swagger.v3.oas.annotations.responses.ApiResponses; | ||
| import io.swagger.v3.oas.annotations.tags.Tag; | ||
| import org.springframework.http.ResponseEntity; | ||
| import org.springframework.validation.annotation.Validated; | ||
| import org.springframework.web.bind.annotation.DeleteMapping; | ||
| import org.springframework.web.bind.annotation.GetMapping; | ||
| import org.springframework.web.bind.annotation.PutMapping; | ||
| import org.springframework.web.bind.annotation.RequestBody; | ||
|
|
||
| @Tag(name = "File storage", description = "File storage operations") | ||
| @Validated | ||
| public interface FileStorageApi { | ||
|
|
||
| @Operation(summary = "Apply pathPrefix", description = "Apply pathPrefix") | ||
| @ApiResponses(value = {@ApiResponse(responseCode = "200", description = "ok")}) | ||
| @GetMapping("/filestorage/path/apply") | ||
| ResponseEntity<ResponseMessage<String>> applyPathPrefix(String flag); | ||
|
|
||
| @Operation(summary = "Apply signedUrls for put", description = "Apply signedUrls for put") | ||
| @ApiResponses(value = {@ApiResponse(responseCode = "200", description = "ok")}) | ||
| @PutMapping("/filestorage/signedurl") | ||
| ResponseEntity<ResponseMessage<SignedUrlResponse>> applySignedPutUrls( | ||
| @RequestBody ApplySignedUrlRequest applySignedUrlRequest); | ||
|
|
||
| @Operation(summary = "Apply signedUrls for get", description = "Apply signedUrls for get") | ||
| @ApiResponses(value = {@ApiResponse(responseCode = "200", description = "ok")}) | ||
| @GetMapping("/filestorage/signedurl") | ||
| ResponseEntity<ResponseMessage<SignedUrlResponse>> applySignedGetUrls(String pathPrefix); | ||
|
|
||
| @Operation(summary = "Delete path", description = "Delete path") | ||
| @ApiResponses(value = {@ApiResponse(responseCode = "200", description = "ok")}) | ||
| @DeleteMapping("/filestorage/file") | ||
| ResponseEntity<ResponseMessage<String>> deletePath(@RequestBody FileDeleteRequest request); | ||
|
|
||
| } |
Oops, something went wrong.