Add clusterUUID column to S3Uploader and ClickHouseExporter #4214
Conversation
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
Codecov Report
@@ Coverage Diff @@
## main #4214 +/- ##
==========================================
- Coverage 60.97% 60.58% -0.40%
==========================================
Files 384 385 +1
Lines 54378 54392 +14
==========================================
- Hits 33159 32954 -205
- Misses 18770 19000 +230
+ Partials 2449 2438 -11
|
heanlan
force-pushed
the
add-clusterID
branch
from
ae5f71e
to
549b563
Compare
antoninbas
reviewed
Sep 8, 2022
antoninbas
reviewed
Sep 9, 2022
pkg/flowaggregator/exporter/ipfix.go
Outdated
| ) | ||
| clusterUUID, err := getClusterUUID(k8sClient) | ||
| if err != nil { | ||
| klog.InfoS("Error when retrieving cluster UUID; will generate a random observation domain ID", "error", err) |
There was a problem hiding this comment.
I think we could switch to klog.ErrorS here
pkg/flowaggregator/exporter/utils.go
Outdated
| clusterUUID = clusterIdentity.UUID | ||
| return true, nil | ||
| }); err != nil { | ||
| return clusterUUID, fmt.Errorf("unable to retrieve cluster UUID, timeout: %v, ConfigMapNameSpace: %s, ConfigMapName: %s", timeout, defaultAntreaNamespace, clusteridentity.DefaultClusterIdentityConfigMapName) |
There was a problem hiding this comment.
Suggested change
| return clusterUUID, fmt.Errorf("unable to retrieve cluster UUID, timeout: %v, ConfigMapNameSpace: %s, ConfigMapName: %s", timeout, defaultAntreaNamespace, clusteridentity.DefaultClusterIdentityConfigMapName) | |
| return clusterUUID, fmt.Errorf("unable to retrieve cluster UUID from ConfigMap '%s/%s': timeout after %v", defaultAntreaNamespace, clusteridentity.DefaultClusterIdentityConfigMapName, timeout) | |
heanlan
force-pushed
the
add-clusterID
branch
2 times, most recently
from
8f74883
to
ab03a81
Compare
heanlan
force-pushed
the
add-clusterID
branch
from
ab03a81
to
9f45287
Compare
dreamtalen
previously approved these changes
Sep 9, 2022
| @@ -81,9 +81,10 @@ const ( | |||
| throughputFromSourceNode, | |||
| throughputFromDestinationNode, | |||
| reverseThroughputFromSourceNode, | |||
| reverseThroughputFromDestinationNode) | |||
| reverseThroughputFromDestinationNode, | |||
| clusterUUID) | |||
There was a problem hiding this comment.
nit: some extra indents here?
There was a problem hiding this comment.
thanks, mixed tabs and spaces
To support multi-cluster, we add a column "clusterUUID" to the S3Uploader and ClickHouseExporter flows table, as the cluster identifier. Signed-off-by: heanlan <[email protected]>
heanlan
force-pushed
the
add-clusterID
branch
from
9f45287
to
c36b30e
Compare
|
/test-all |
antoninbas
approved these changes
Sep 9, 2022
dreamtalen
approved these changes
Sep 12, 2022
|
/test-all |
|
Hi @antoninbas , shall we merge it? The successful run of jenkins e2e is here: http://10.176.27.169:8080/job/antrea-e2e-for-pull-request/1413/ |
heanlan
added a commit
to heanlan/antrea
that referenced
this pull request
Mar 29, 2023
…o#4214) To support multi-cluster, we add a column "clusterUUID" to the S3Uploader and ClickHouseExporter flows table, as the cluster identifier. Signed-off-by: heanlan <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
To support multi-cluster, we add a column "clusterUUID" to the S3Uploader and ClickHouseExporter flows table, as the cluster identifier.
Signed-off-by: heanlan [email protected]