-
Notifications
You must be signed in to change notification settings - Fork 202
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.
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
feat: 定时任务兼容不合法主机 #3305 #3314
Open
wangyu096
wants to merge
10
commits into
TencentBlueKing:master
Choose a base branch
from
wangyu096:issue_3305
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
feat: 定时任务兼容不合法主机 #3305 #3314
Changes from 7 commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
1be8dac
feat: 定时任务兼容不合法主机 #3305
wangyu096 530ea97
feat: 定时任务兼容不合法主机 #3305
wangyu096 e5af8c5
feat: 定时任务兼容不合法主机 #3305
wangyu096 fe09543
feat: 定时任务兼容不合法主机 #3305
wangyu096 983977f
feat: 定时任务兼容不合法主机 #3305
wangyu096 8bfd962
feat: 定时任务兼容不合法主机 #3305
wangyu096 f6a8737
feat: 定时任务兼容不合法主机 #3305
wangyu096 cfd53f0
feat: 定时任务兼容不合法主机 #3305
wangyu096 02c60bc
Merge branch 'master' of https://github.com/Tencent/bk-job into issue…
wangyu096 73fcfb2
Merge branch 'master' of https://github.com/Tencent/bk-job into issue…
wangyu096 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
107 changes: 107 additions & 0 deletions
107
...ackend/commons/common/src/main/java/com/tencent/bk/job/common/model/HostCompositeKey.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,107 @@ | ||
| /* | ||
| * Tencent is pleased to support the open source community by making BK-JOB蓝鲸智云作业平台 available. | ||
| * | ||
| * Copyright (C) 2021 THL A29 Limited, a Tencent company. All rights reserved. | ||
| * | ||
| * BK-JOB蓝鲸智云作业平台 is licensed under the MIT License. | ||
| * | ||
| * License for BK-JOB蓝鲸智云作业平台: | ||
| * -------------------------------------------------------------------- | ||
| * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated | ||
| * documentation files (the "Software"), to deal in the Software without restriction, including without limitation | ||
| * the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and | ||
| * to permit persons to whom the Software is furnished to do so, subject to the following conditions: | ||
| * | ||
| * The above copyright notice and this permission notice shall be included in all copies or substantial portions of | ||
| * the Software. | ||
| * | ||
| * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO | ||
| * THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF | ||
| * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS | ||
| * IN THE SOFTWARE. | ||
| */ | ||
|
|
||
| package com.tencent.bk.job.common.model; | ||
|
|
||
| import com.tencent.bk.job.common.model.dto.HostDTO; | ||
| import lombok.Getter; | ||
| import lombok.Setter; | ||
|
|
||
| import java.util.Objects; | ||
|
|
||
| /** | ||
| * 主机复合 KEY，用于主机的多种表达方式 | ||
| */ | ||
| @Getter | ||
| @Setter | ||
| public class HostCompositeKey { | ||
| /** | ||
| * Key 类型 | ||
| */ | ||
| private final HostCompositeKeyType keyType; | ||
|
|
||
| /** | ||
| * 主机唯一 key（目前支持 hostId/cloudIp 两种） | ||
| */ | ||
| private final String key; | ||
|
|
||
| public HostCompositeKey(HostCompositeKeyType keyType, String key) { | ||
| this.keyType = keyType; | ||
| this.key = key; | ||
| } | ||
|
|
||
| public static HostCompositeKey ofHost(HostDTO host) { | ||
| if (host.getHostId() != null) { | ||
| // 优先使用 hostId | ||
| return new HostCompositeKey(HostCompositeKeyType.HOST_ID, String.valueOf(host.getHostId())); | ||
| } else if (host.toCloudIp() != null) { | ||
| // 没有 hostId, 使用管控区域 ID + ipv4 | ||
| return new HostCompositeKey(HostCompositeKeyType.CLOUD_IP, host.toCloudIp()); | ||
| } else { | ||
| throw new IllegalArgumentException("Invalid host, both hostId or cloudIp are empty"); | ||
| } | ||
| } | ||
|
|
||
|
|
||
| @Getter | ||
| public enum HostCompositeKeyType { | ||
| /** | ||
| * HostId 作为 KEY | ||
| */ | ||
| HOST_ID(1), | ||
| /** | ||
| * 管控区域 ID+ ipv4 作为 KEY | ||
| */ | ||
| CLOUD_IP(2); | ||
|
|
||
| private final int value; | ||
|
|
||
| HostCompositeKeyType(int value) { | ||
| this.value = value; | ||
| } | ||
|
|
||
| } | ||
|
|
||
| @Override | ||
| public boolean equals(Object o) { | ||
| if (this == o) return true; | ||
| if (o == null || getClass() != o.getClass()) return false; | ||
| HostCompositeKey that = (HostCompositeKey) o; | ||
| if (this.getKeyType() != that.getKeyType()) { | ||
| return false; | ||
| } | ||
|
|
||
| return keyType == ((HostCompositeKey) o).getKeyType() && key.equals(that.getKey()); | ||
| } | ||
|
|
||
| @Override | ||
| public int hashCode() { | ||
| return Objects.hash(keyType, key); | ||
| } | ||
|
|
||
| @Override | ||
| public String toString() { | ||
| return keyType.getValue() + ":" + key; | ||
| } | ||
| } |
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
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
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
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
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
建议增加对null值的处理