Skip to content
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.

Sign up for GitHub

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

Sync main changes #253

Merged
merged 4 commits into from
May 20, 2024
Merged

Sync main changes #253

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c6c8731
Merge pull request #249 from xtreme1-io/fix-parseIntensityError
jaggerwang May 13, 2024
ecd687d
通过上调 failureThreshold 次数来增加 startupProbe 等待时长
jaggerwang May 13, 2024
9d94aca
Merge branches 'main' and 'main' of github.com:xtreme1-io/xtreme1
jaggerwang May 13, 2024
92b3e1f
Merge pull request #252 from xtreme1-io/hotfix-0.8.1
jaggerwang May 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions .ops/deploy/backend/base/backend.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,22 +34,19 @@ spec:
httpGet:
path: /actuator/health/liveness
port: 8080
periodSeconds: 10
failureThreshold: 6
# 默认 periodSeconds 为 10s，failureThreshold 为 3 次，那么默认的等待时长为 10 * 3 = 30s，
# 对于启动比较慢的 Java 应用不太够，需要上调 periodSeconds 或 failureThreshold
failureThreshold: 10
# 存活探针，会尝试多次，如果失败将重启服务
livenessProbe:
httpGet:
path: /actuator/health/liveness
port: 8080
periodSeconds: 10
failureThreshold: 3
# 就绪探针，如果失败将拒绝服务
readinessProbe:
httpGet:
path: /actuator/health/readiness
port: 8080
initialDelaySeconds: 10
periodSeconds: 10
volumeMounts:
- name: config
mountPath: /app/config
Expand Down
4 changes: 2 additions & 2 deletions backend/src/main/java/ai/basic/x1/adapter/api/job/converter/ModelCocoRequestConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ public static ImageDetectionReqDTO convert(ModelMessageBO message) {
var fileNodeBO = fileNodes.get(0);
String url;
if (fileNodeBO.getType().equals(FILE)) {
url = fileNodeBO.getFile().getInternalUrl();
url = fileNodeBO.getFile().getUrl();
} else {
url = fileNodeBO.getFiles().get(0).getFile().getInternalUrl();
url = fileNodeBO.getFiles().get(0).getFile().getUrl();
}
if (StrUtil.isEmpty(url)) {
throw new IllegalArgumentException("file url is empty");
Expand Down
8 changes: 4 additions & 4 deletions ...main/java/ai/basic/x1/adapter/api/job/converter/PointCloudDetectionModelReqConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,19 +52,19 @@ private static void traverFile(DataInfoBO.FileNodeBO fileNodeBO, DataInfo dataIn
if (prePath.startsWith(CAMERA_IMAGE)) {
if (CollUtil.isEmpty(dataInfo.getImageUrls())) {
List<String> imageUrlList = new ArrayList<>();
imageUrlList.add(fileNodeBO.getFile().getInternalUrl());
imageUrlList.add(fileNodeBO.getFile().getUrl());
dataInfo.setImageUrls(imageUrlList);
} else {
dataInfo.getImageUrls().add(fileNodeBO.getFile().getInternalUrl());
dataInfo.getImageUrls().add(fileNodeBO.getFile().getUrl());
}
}
//pcd
if (prePath.startsWith(LIDAR_POINT_CLOUD)) {
dataInfo.setPointCloudUrl(getFileBO(fileNodeBO.getFile()).getInternalUrl());
dataInfo.setPointCloudUrl(getFileBO(fileNodeBO.getFile()).getUrl());
}
//cameraConfig
if (prePath.startsWith(CAMERA_CONFIG)) {
dataInfo.setCameraConfigUrl(fileNodeBO.getFile().getInternalUrl());
dataInfo.setCameraConfigUrl(fileNodeBO.getFile().getUrl());
}
}
if (DIRECTORY.equals(fileNodeBO.getType()) && CollUtil.isNotEmpty(fileNodeBO.getFiles())) {
Expand Down
Loading