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.

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

Add support for Cloudera CDS-3.3.2 #9396

Merged
merged 4 commits into from
Oct 16, 2023

Conversation

sririshindra
Copy link
Contributor

This PR add support for Cloudera's CDS-3.3.2 spark release. This is quite similar to CDS3.3.0 release.

@tgravescs
Copy link
Collaborator

build

@sameerz sameerz added the task Work required that improves the product but is not user facing label Oct 6, 2023
Change-Id: I0c4427947d4db88d7d96ccc0f59a8cb5ba4813c6
pom.xml Outdated
Comment on lines 476 to 493
<repositories>
<repository>
<id>cloudera-repo</id>
<url>https://repository.cloudera.com/artifactory/cloudera-repos/</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>cloudera-repo</id>
<url>https://repository.cloudera.com/artifactory/cloudera-repos/</url>
</pluginRepository>
</pluginRepositories>
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We get more and more of these. Let us move repeated repo definitions out of all CDH profiles and have them defined in the global lists at the bottom of the pom like this:

  <repositories>
      ...
      <repository>
            <id>cloudera-repo</id>
            <url>https://repository.cloudera.com/artifactory/cloudera-repos/</url>
            <releases>
                <enabled>${cloudera.repo.enabled}</enabled>
            </releases>
            <snapshots>
                <enabled>${cloudera.repo.enabled}</enabled>
            </snapshots>
        </repository>
  </repositories>
  <pluginRepositories>
...
        <pluginRepository>
            <id>cloudera-repo</id>
            <url>https://repository.cloudera.com/artifactory/cloudera-repos/</url>
            <releases>
                <enabled>${cloudera.repo.enabled}</enabled>
            </releases>
            <snapshots>
                <enabled>${cloudera.repo.enabled}</enabled>
            </snapshots>
        </pluginRepository>
   </pluginRepositories>

the we can add just a single line to each CDH profile properties:

<cloudera.repo.enabled>true</cloudera.repo.enabled>

override def getShimVersion: ShimVersion = SparkShimServiceProvider.VERSION

def matchesVersion(version: String): Boolean = {
version.contains(SparkShimServiceProvider.CDH_BASE_VERSION)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess we always do it like this, but wonder if it should be more restrictive like startsWith or equality after stripping spaces etc.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this could be on a shim specific case depending on what we are expecting. But if we want to look at it, I propose we file a separate issue as it affects more then this shim.

@tgravescs
Copy link
Collaborator

@sririshindra can you update to resolve the conflicts with the files when you have time?

rishi added 2 commits October 14, 2023 07:43
Change-Id: I9f05def7dae9b0a6e63b6ac40460f12a7847708c
…332cdh

Change-Id: I76ee6e036136919a1cdb0b95cb67bf19c35292bc
Copy link
Collaborator

@gerashegalov gerashegalov left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@gerashegalov
Copy link
Collaborator

build

@tgravescs
Copy link
Collaborator

build

@sririshindra sririshindra changed the title [WIP] Add support for Cloudera CDS-3.3.2 Add support for Cloudera CDS-3.3.2 Oct 16, 2023
@tgravescs tgravescs merged commit dd07fda into NVIDIA:branch-23.12 Oct 16, 2023
30 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
task Work required that improves the product but is not user facing
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants