From feee1b72b37167ee360a3245ddfe5c2092cec5dc Mon Sep 17 00:00:00 2001 From: Rahul Singh Date: Wed, 28 Dec 2022 13:09:15 +0530 Subject: [PATCH 01/37] Added the workflow --- .github/workflows/main.yml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 .github/workflows/main.yml diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml new file mode 100644 index 000000000000..851793040b4d --- /dev/null +++ b/.github/workflows/main.yml @@ -0,0 +1,20 @@ +name: Cassandra Deployment +on: + push: + branches: + - master + - main + - juspay-4.1 + - local-test +jobs: + job1: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - name: Set up JDK 11 + uses: actions/setup-java@v3 + with: + java-version: '11' + distribution: 'adopt' + - name: Build with Ant + run: ant -noinput -buildfile build.xml -Duse.jdk11=true From 93d9213edb039fcff5f0dd1d1b0171fbcf5bac12 Mon Sep 17 00:00:00 2001 From: Rahul Singh Date: Wed, 28 Dec 2022 13:14:49 +0530 Subject: [PATCH 02/37] with skip krat --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 851793040b4d..b09432bf6a0c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -17,4 +17,4 @@ jobs: java-version: '11' distribution: 'adopt' - name: Build with Ant - run: ant -noinput -buildfile build.xml -Duse.jdk11=true + run: ant -noinput -buildfile build.xml -Duse.jdk11=true -Drat.skip=true From db1a2b567a3556d040474ebb8977d26e3f5747d0 Mon Sep 17 00:00:00 2001 From: Rahul Singh Date: Wed, 28 Dec 2022 15:00:53 +0530 Subject: [PATCH 03/37] Adde the change to local fork --- .github/workflows/main.yml | 1 - conf/cassandra.yaml | 6 +- .../cassandra/locator/HttpSeedProvider.java | 126 ++++++++++++++++++ test/conf/cassandra-murmur.yaml | 6 +- test/conf/cassandra-old.yaml | 6 +- .../cassandra-pem-jks-sslcontextfactory.yaml | 6 +- ...slcontextfactory-invalidconfiguration.yaml | 6 +- .../conf/cassandra-pem-sslcontextfactory.yaml | 6 +- test/conf/cassandra-seeds.yaml | 6 +- ...slcontextfactory-invalidconfiguration.yaml | 6 +- test/conf/cassandra-sslcontextfactory.yaml | 6 +- test/conf/cassandra.yaml | 6 +- .../conf/unit-test-conf/test-native-port.yaml | 6 +- .../distributed/impl/InstanceConfig.java | 6 +- .../config/DatabaseDescriptorRefTest.java | 2 +- .../FailStartupDuplicateParamsTest.java | 2 +- .../config/YamlConfigurationLoaderTest.java | 10 +- 17 files changed, 168 insertions(+), 45 deletions(-) create mode 100644 src/java/org/apache/cassandra/locator/HttpSeedProvider.java diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b09432bf6a0c..86e2f5441270 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -5,7 +5,6 @@ on: - master - main - juspay-4.1 - - local-test jobs: job1: runs-on: ubuntu-latest diff --git a/conf/cassandra.yaml b/conf/cassandra.yaml index ef7cc72605eb..63cef746900e 100644 --- a/conf/cassandra.yaml +++ b/conf/cassandra.yaml @@ -546,11 +546,9 @@ seed_provider: # Cassandra nodes use this list of hosts to find each other and learn # the topology of the ring. You must change this if you are running # multiple nodes! - - class_name: org.apache.cassandra.locator.SimpleSeedProvider + - class_name: org.apache.cassandra.locator.HttpSeedProvider parameters: - # seeds is actually a comma-delimited list of addresses. - # Ex: ",," - - seeds: "127.0.0.1:7000" + - seedsUrl: "https://5wv7m0j42b.execute-api.ap-northeast-1.amazonaws.com/default/getSeedsFromMem" # For workloads with more data than can fit in memory, Cassandra's # bottleneck will be reads that need to fetch data from diff --git a/src/java/org/apache/cassandra/locator/HttpSeedProvider.java b/src/java/org/apache/cassandra/locator/HttpSeedProvider.java new file mode 100644 index 000000000000..d473351f24e8 --- /dev/null +++ b/src/java/org/apache/cassandra/locator/HttpSeedProvider.java @@ -0,0 +1,126 @@ +package org.apache.cassandra.locator; + +import java.net.UnknownHostException; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.net.http.HttpClient; +import java.net.http.HttpResponse.BodyHandlers; +import java.net.http.HttpRequest; +import java.util.function.Supplier; +import java.net.URI; +import org.apache.cassandra.config.Config; +import org.apache.cassandra.config.DatabaseDescriptor; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import com.fasterxml.jackson.annotation.JsonProperty; + +// class JsonBodyHandler implements HttpResponse.BodyHandler> { + +// private final Class wClass; + +// public JsonBodyHandler(Class wClass) { +// this.wClass = wClass; +// } + +// public static HttpResponse.BodySubscriber> asJSON(Class targetType) { +// HttpResponse.BodySubscriber upstream = HttpResponse.BodySubscribers.ofInputStream(); + +// return HttpResponse.BodySubscribers.mapping( +// upstream, +// inputStream -> toSupplierOfType(inputStream, targetType)); +// } + +// public static Supplier toSupplierOfType(InputStream inputStream, Class targetType) { +// return () -> { +// try (InputStream stream = inputStream) { +// ObjectMapper objectMapper = new ObjectMapper(); +// return objectMapper.readValue(stream, targetType); +// } catch (IOException e) { +// throw new UncheckedIOException(e); +// } +// }; +// } + + +// @Override +// public HttpResponse.BodySubscriber> apply(HttpResponse.ResponseInfo responseInfo) { +// return asJSON(wClass); +// } + +// } + + +// class APOD { +// public final String copyright; +// public final String date; +// public final String explanation; +// public final String hdUrl; +// public final String mediaType; +// public final String serviceVersion; +// public final String title; +// public final String url; + +// public APOD(@JsonProperty("copyright") String copyright, +// @JsonProperty("date") String date, +// @JsonProperty("explanation") String explanation, +// @JsonProperty("hdurl") String hdUrl, +// @JsonProperty("media_type") String mediaType, +// @JsonProperty("service_version") String serviceVersion, +// @JsonProperty("title") String title, +// @JsonProperty("url") String url) { +// this.copyright = copyright; +// this.date = date; +// this.explanation = explanation; +// this.hdUrl = hdUrl; +// this.mediaType = mediaType; +// this.serviceVersion = serviceVersion; +// this.title = title; +// this.url = url; +// } +// } + +public class HttpSeedProvider implements SeedProvider +{ + private static final Logger logger = LoggerFactory.getLogger(HttpSeedProvider.class); + public HttpClient client = HttpClient.newHttpClient(); + + public HttpSeedProvider(Map args) {} + + public List getSeeds() + { + Config conf; + List seeds = new ArrayList<>(0); + try + { + conf = DatabaseDescriptor.loadConfig(); + var request = HttpRequest.newBuilder( + URI.create(conf.seed_provider.parameters.get("seedsUrl"))) + .header("accept", "application/json") + .build(); + var response = client.send(request, BodyHandlers.ofString()); + String[] hosts = response.body().replace("\"", "").split(",", -1); + seeds = new ArrayList<>(hosts.length); + for (String host : hosts) + { + String hostPortString = host.trim(); + try + { + if(!hostPortString.isEmpty()) { + seeds.add(InetAddressAndPort.getByName(hostPortString)); + } + } + catch (UnknownHostException ex) + { + logger.warn("Seed provider couldn't lookup host {}", host); + } + } + } + catch (Exception e) + { + throw new AssertionError(e); + } + return Collections.unmodifiableList(seeds); + } +} diff --git a/test/conf/cassandra-murmur.yaml b/test/conf/cassandra-murmur.yaml index c0c2ae71f615..aa4afef83deb 100644 --- a/test/conf/cassandra-murmur.yaml +++ b/test/conf/cassandra-murmur.yaml @@ -22,9 +22,9 @@ data_file_directories: - build/test/cassandra/data disk_access_mode: mmap seed_provider: - - class_name: org.apache.cassandra.locator.SimpleSeedProvider - parameters: - - seeds: "127.0.0.1:7012" + - class_name: org.apache.cassandra.locator.HttpSeedProvider + parameters: + - seedsUrl: "https://5wv7m0j42b.execute-api.ap-northeast-1.amazonaws.com/default/getSeedsFromMem" endpoint_snitch: org.apache.cassandra.locator.SimpleSnitch dynamic_snitch: true server_encryption_options: diff --git a/test/conf/cassandra-old.yaml b/test/conf/cassandra-old.yaml index 86983acc9e60..4d99683383ca 100644 --- a/test/conf/cassandra-old.yaml +++ b/test/conf/cassandra-old.yaml @@ -26,9 +26,9 @@ data_file_directories: - build/test/cassandra/data disk_access_mode: mmap seed_provider: - - class_name: org.apache.cassandra.locator.SimpleSeedProvider - parameters: - - seeds: "127.0.0.1:7012" + - class_name: org.apache.cassandra.locator.HttpSeedProvider + parameters: + - seedsUrl: "https://5wv7m0j42b.execute-api.ap-northeast-1.amazonaws.com/default/getSeedsFromMem" endpoint_snitch: org.apache.cassandra.locator.SimpleSnitch dynamic_snitch: true server_encryption_options: diff --git a/test/conf/cassandra-pem-jks-sslcontextfactory.yaml b/test/conf/cassandra-pem-jks-sslcontextfactory.yaml index 1f10e6c2039e..16b62ab2cb26 100644 --- a/test/conf/cassandra-pem-jks-sslcontextfactory.yaml +++ b/test/conf/cassandra-pem-jks-sslcontextfactory.yaml @@ -43,9 +43,9 @@ data_file_directories: - build/test/cassandra/data disk_access_mode: mmap seed_provider: - - class_name: org.apache.cassandra.locator.SimpleSeedProvider - parameters: - - seeds: "127.0.0.1:7012" + - class_name: org.apache.cassandra.locator.HttpSeedProvider + parameters: + - seedsUrl: "https://5wv7m0j42b.execute-api.ap-northeast-1.amazonaws.com/default/getSeedsFromMem" endpoint_snitch: org.apache.cassandra.locator.SimpleSnitch dynamic_snitch: true client_encryption_options: diff --git a/test/conf/cassandra-pem-sslcontextfactory-invalidconfiguration.yaml b/test/conf/cassandra-pem-sslcontextfactory-invalidconfiguration.yaml index 8c7d910f4918..55eb560c3c10 100644 --- a/test/conf/cassandra-pem-sslcontextfactory-invalidconfiguration.yaml +++ b/test/conf/cassandra-pem-sslcontextfactory-invalidconfiguration.yaml @@ -43,9 +43,9 @@ data_file_directories: - build/test/cassandra/data disk_access_mode: mmap seed_provider: - - class_name: org.apache.cassandra.locator.SimpleSeedProvider - parameters: - - seeds: "127.0.0.1:7012" + - class_name: org.apache.cassandra.locator.HttpSeedProvider + parameters: + - seedsUrl: "https://5wv7m0j42b.execute-api.ap-northeast-1.amazonaws.com/default/getSeedsFromMem" endpoint_snitch: org.apache.cassandra.locator.SimpleSnitch dynamic_snitch: true client_encryption_options: diff --git a/test/conf/cassandra-pem-sslcontextfactory.yaml b/test/conf/cassandra-pem-sslcontextfactory.yaml index 26d0f1f998d6..a62099149a3c 100644 --- a/test/conf/cassandra-pem-sslcontextfactory.yaml +++ b/test/conf/cassandra-pem-sslcontextfactory.yaml @@ -43,9 +43,9 @@ data_file_directories: - build/test/cassandra/data disk_access_mode: mmap seed_provider: - - class_name: org.apache.cassandra.locator.SimpleSeedProvider - parameters: - - seeds: "127.0.0.1:7012" + - class_name: org.apache.cassandra.locator.HttpSeedProvider + parameters: + - seedsUrl: "https://5wv7m0j42b.execute-api.ap-northeast-1.amazonaws.com/default/getSeedsFromMem" endpoint_snitch: org.apache.cassandra.locator.SimpleSnitch dynamic_snitch: true client_encryption_options: diff --git a/test/conf/cassandra-seeds.yaml b/test/conf/cassandra-seeds.yaml index 1c38f8e1ad42..b060a4152fc2 100644 --- a/test/conf/cassandra-seeds.yaml +++ b/test/conf/cassandra-seeds.yaml @@ -23,9 +23,9 @@ data_file_directories: - build/test/cassandra/data disk_access_mode: mmap seed_provider: - - class_name: org.apache.cassandra.locator.SimpleSeedProvider - parameters: - - seeds: "127.0.0.10,127.0.1.10,127.0.2.10" + - class_name: org.apache.cassandra.locator.HttpSeedProvider + parameters: + - seedsUrl: "https://5wv7m0j42b.execute-api.ap-northeast-1.amazonaws.com/default/getSeedsFromMem" endpoint_snitch: org.apache.cassandra.locator.SimpleSnitch dynamic_snitch: true server_encryption_options: diff --git a/test/conf/cassandra-sslcontextfactory-invalidconfiguration.yaml b/test/conf/cassandra-sslcontextfactory-invalidconfiguration.yaml index d3970cbf98af..0738b3771457 100644 --- a/test/conf/cassandra-sslcontextfactory-invalidconfiguration.yaml +++ b/test/conf/cassandra-sslcontextfactory-invalidconfiguration.yaml @@ -44,9 +44,9 @@ data_file_directories: - build/test/cassandra/data disk_access_mode: mmap seed_provider: - - class_name: org.apache.cassandra.locator.SimpleSeedProvider - parameters: - - seeds: "127.0.0.1:7012" + - class_name: org.apache.cassandra.locator.HttpSeedProvider + parameters: + - seedsUrl: "https://5wv7m0j42b.execute-api.ap-northeast-1.amazonaws.com/default/getSeedsFromMem" endpoint_snitch: org.apache.cassandra.locator.SimpleSnitch dynamic_snitch: true client_encryption_options: diff --git a/test/conf/cassandra-sslcontextfactory.yaml b/test/conf/cassandra-sslcontextfactory.yaml index fde4bfdc6dc2..433550186a1b 100644 --- a/test/conf/cassandra-sslcontextfactory.yaml +++ b/test/conf/cassandra-sslcontextfactory.yaml @@ -44,9 +44,9 @@ data_file_directories: - build/test/cassandra/data disk_access_mode: mmap seed_provider: - - class_name: org.apache.cassandra.locator.SimpleSeedProvider - parameters: - - seeds: "127.0.0.1:7012" + - class_name: org.apache.cassandra.locator.HttpSeedProvider + parameters: + - seedsUrl: "https://5wv7m0j42b.execute-api.ap-northeast-1.amazonaws.com/default/getSeedsFromMem" endpoint_snitch: org.apache.cassandra.locator.SimpleSnitch dynamic_snitch: true client_encryption_options: diff --git a/test/conf/cassandra.yaml b/test/conf/cassandra.yaml index 80de2393902a..e3ab9008b086 100644 --- a/test/conf/cassandra.yaml +++ b/test/conf/cassandra.yaml @@ -26,9 +26,9 @@ data_file_directories: - build/test/cassandra/data disk_access_mode: mmap seed_provider: - - class_name: org.apache.cassandra.locator.SimpleSeedProvider - parameters: - - seeds: "127.0.0.1:7012" + - class_name: org.apache.cassandra.locator.HttpSeedProvider + parameters: + - seedsUrl: "https://5wv7m0j42b.execute-api.ap-northeast-1.amazonaws.com/default/getSeedsFromMem" endpoint_snitch: org.apache.cassandra.locator.SimpleSnitch dynamic_snitch: true server_encryption_options: diff --git a/test/conf/unit-test-conf/test-native-port.yaml b/test/conf/unit-test-conf/test-native-port.yaml index c8ed929cc643..5a20afe27676 100644 --- a/test/conf/unit-test-conf/test-native-port.yaml +++ b/test/conf/unit-test-conf/test-native-port.yaml @@ -26,9 +26,9 @@ data_file_directories: - build/test/cassandra/data disk_access_mode: mmap seed_provider: -- class_name: org.apache.cassandra.locator.SimpleSeedProvider - parameters: - - seeds: "127.0.0.1:7010" + - class_name: org.apache.cassandra.locator.HttpSeedProvider + parameters: + - seedsUrl: "https://5wv7m0j42b.execute-api.ap-northeast-1.amazonaws.com/default/getSeedsFromMem" endpoint_snitch: org.apache.cassandra.locator.SimpleSnitch dynamic_snitch: true server_encryption_options: diff --git a/test/distributed/org/apache/cassandra/distributed/impl/InstanceConfig.java b/test/distributed/org/apache/cassandra/distributed/impl/InstanceConfig.java index a27daac0e633..9236bb4a6165 100644 --- a/test/distributed/org/apache/cassandra/distributed/impl/InstanceConfig.java +++ b/test/distributed/org/apache/cassandra/distributed/impl/InstanceConfig.java @@ -37,7 +37,7 @@ import org.apache.cassandra.distributed.shared.NetworkTopology; import org.apache.cassandra.distributed.upgrade.UpgradeTestBase; import org.apache.cassandra.locator.InetAddressAndPort; -import org.apache.cassandra.locator.SimpleSeedProvider; +import org.apache.cassandra.locator.HttpSeedProvider; public class InstanceConfig implements IInstanceConfig { @@ -101,7 +101,7 @@ private InstanceConfig(int num, .set("storage_port", storage_port) .set("native_transport_port", native_transport_port) .set("endpoint_snitch", DistributedTestSnitch.class.getName()) - .set("seed_provider", new ParameterizedClass(SimpleSeedProvider.class.getName(), + .set("seed_provider", new ParameterizedClass(HttpSeedProvider.class.getName(), Collections.singletonMap("seeds", seedIp + ":" + seedPort))) // required settings for dtest functionality .set("diagnostic_events_enabled", true) @@ -286,7 +286,7 @@ public InstanceConfig forVersion(Semver version) return this; else return new InstanceConfig(this) - .set("seed_provider", new ParameterizedClass(SimpleSeedProvider.class.getName(), + .set("seed_provider", new ParameterizedClass(HttpSeedProvider.class.getName(), Collections.singletonMap("seeds", "127.0.0.1"))); } diff --git a/test/unit/org/apache/cassandra/config/DatabaseDescriptorRefTest.java b/test/unit/org/apache/cassandra/config/DatabaseDescriptorRefTest.java index 3ee05cf96f5c..7c4e42f7ec56 100644 --- a/test/unit/org/apache/cassandra/config/DatabaseDescriptorRefTest.java +++ b/test/unit/org/apache/cassandra/config/DatabaseDescriptorRefTest.java @@ -193,7 +193,7 @@ public class DatabaseDescriptorRefTest "org.apache.cassandra.io.util.PathUtils$IOToLongFunction", "org.apache.cassandra.locator.Replica", "org.apache.cassandra.locator.ReplicaCollection", - "org.apache.cassandra.locator.SimpleSeedProvider", + "org.apache.cassandra.locator.HttpSeedProvider", "org.apache.cassandra.locator.SeedProvider", "org.apache.cassandra.security.ISslContextFactory", "org.apache.cassandra.security.SSLFactory", diff --git a/test/unit/org/apache/cassandra/config/FailStartupDuplicateParamsTest.java b/test/unit/org/apache/cassandra/config/FailStartupDuplicateParamsTest.java index 341a0e83ecee..f446e9188d47 100644 --- a/test/unit/org/apache/cassandra/config/FailStartupDuplicateParamsTest.java +++ b/test/unit/org/apache/cassandra/config/FailStartupDuplicateParamsTest.java @@ -50,7 +50,7 @@ public class FailStartupDuplicateParamsTest "data_file_directories:", " - build/test/cassandra/data", "seed_provider:" , - " - class_name: org.apache.cassandra.locator.SimpleSeedProvider", + " - class_name: org.apache.cassandra.locator.HttpSeedProvider", "parameters:", " - seeds: \"127.0.0.1:7012\"", "endpoint_snitch: org.apache.cassandra.locator.SimpleSnitch"); diff --git a/test/unit/org/apache/cassandra/config/YamlConfigurationLoaderTest.java b/test/unit/org/apache/cassandra/config/YamlConfigurationLoaderTest.java index 06be1dc2096a..583df4a7185c 100644 --- a/test/unit/org/apache/cassandra/config/YamlConfigurationLoaderTest.java +++ b/test/unit/org/apache/cassandra/config/YamlConfigurationLoaderTest.java @@ -66,7 +66,7 @@ public void updateInPlace() Config config = new Config(); Map map = ImmutableMap.builder().put("storage_port", 123) .put("commitlog_sync", Config.CommitLogSync.batch) - .put("seed_provider.class_name", "org.apache.cassandra.locator.SimpleSeedProvider") + .put("seed_provider.class_name", "org.apache.cassandra.locator.HttpSeedProvider") .put("client_encryption_options.cipher_suites", Collections.singletonList("FakeCipher")) .put("client_encryption_options.optional", false) .put("client_encryption_options.enabled", true) @@ -75,7 +75,7 @@ public void updateInPlace() assert updated == config : "Config pointers do not match"; assertThat(config.storage_port).isEqualTo(123); assertThat(config.commitlog_sync).isEqualTo(Config.CommitLogSync.batch); - assertThat(config.seed_provider.class_name).isEqualTo("org.apache.cassandra.locator.SimpleSeedProvider"); + assertThat(config.seed_provider.class_name).isEqualTo("org.apache.cassandra.locator.HttpSeedProvider"); assertThat(config.client_encryption_options.cipher_suites).isEqualTo(Collections.singletonList("FakeCipher")); assertThat(config.client_encryption_options.optional).isFalse(); assertThat(config.client_encryption_options.enabled).isTrue(); @@ -94,7 +94,7 @@ public void withSystemProperties() try (WithProperties ignore = new WithProperties(CONFIG_ALLOW_SYSTEM_PROPERTIES.getKey(), "true", SYSTEM_PROPERTY_PREFIX + "storage_port", "123", SYSTEM_PROPERTY_PREFIX + "commitlog_sync", "batch", - SYSTEM_PROPERTY_PREFIX + "seed_provider.class_name", "org.apache.cassandra.locator.SimpleSeedProvider", + SYSTEM_PROPERTY_PREFIX + "seed_provider.class_name", "org.apache.cassandra.locator.HttpSeedProvider", // PROPERTY_PREFIX + "client_encryption_options.cipher_suites", "[\"FakeCipher\"]", SYSTEM_PROPERTY_PREFIX + "client_encryption_options.optional", "false", SYSTEM_PROPERTY_PREFIX + "client_encryption_options.enabled", "true", @@ -104,7 +104,7 @@ public void withSystemProperties() Config config = YamlConfigurationLoader.fromMap(Collections.emptyMap(), true, Config.class); assertThat(config.storage_port).isEqualTo(123); assertThat(config.commitlog_sync).isEqualTo(Config.CommitLogSync.batch); - assertThat(config.seed_provider.class_name).isEqualTo("org.apache.cassandra.locator.SimpleSeedProvider"); + assertThat(config.seed_provider.class_name).isEqualTo("org.apache.cassandra.locator.HttpSeedProvider"); // assertThat(config.client_encryption_options.cipher_suites).isEqualTo(Collections.singletonList("FakeCipher")); assertThat(config.client_encryption_options.optional).isFalse(); assertThat(config.client_encryption_options.enabled).isTrue(); @@ -221,7 +221,7 @@ public void fromMapTest() { int storagePort = 123; Config.CommitLogSync commitLogSync = Config.CommitLogSync.batch; - ParameterizedClass seedProvider = new ParameterizedClass("org.apache.cassandra.locator.SimpleSeedProvider", Collections.emptyMap()); + ParameterizedClass seedProvider = new ParameterizedClass("org.apache.cassandra.locator.HttpSeedProvider", Collections.emptyMap()); Map encryptionOptions = ImmutableMap.of("cipher_suites", Collections.singletonList("FakeCipher"), "optional", false, "enabled", true); From 0bd6a85c35d7fdc63e71048e02d8697459f49bbd Mon Sep 17 00:00:00 2001 From: Rahul Singh Date: Wed, 28 Dec 2022 15:04:46 +0530 Subject: [PATCH 04/37] Fixed the job name fix --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 86e2f5441270..00d575756c68 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -6,7 +6,7 @@ on: - main - juspay-4.1 jobs: - job1: + build: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 From 1f260c0df02ea7911f00e44f0de293fe1ce0eb72 Mon Sep 17 00:00:00 2001 From: Rahul Singh Date: Wed, 28 Dec 2022 17:26:32 +0530 Subject: [PATCH 05/37] Added upload arti-jar --- .github/workflows/main.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 00d575756c68..90e31cf734b6 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -17,3 +17,7 @@ jobs: distribution: 'adopt' - name: Build with Ant run: ant -noinput -buildfile build.xml -Duse.jdk11=true -Drat.skip=true + - uses: actions/upload-artifact@v3 + with: + name: Package + path: build/jar \ No newline at end of file From d01599a81470872ceb2f5a84f6ae084926127b63 Mon Sep 17 00:00:00 2001 From: Rahul Singh Date: Wed, 28 Dec 2022 18:01:01 +0530 Subject: [PATCH 06/37] jar build --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 90e31cf734b6..473f1a230fc3 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -16,8 +16,8 @@ jobs: java-version: '11' distribution: 'adopt' - name: Build with Ant - run: ant -noinput -buildfile build.xml -Duse.jdk11=true -Drat.skip=true + run: ant -noinput -buildfile build.xml jar -Duse.jdk11=true -Drat.skip=true - uses: actions/upload-artifact@v3 with: name: Package - path: build/jar \ No newline at end of file + path: build \ No newline at end of file From dab69279272a5a330a37a89c54ab71c1649b08e4 Mon Sep 17 00:00:00 2001 From: Rahul Singh Date: Wed, 28 Dec 2022 18:29:29 +0530 Subject: [PATCH 07/37] release in workflow --- .github/workflows/main.yml | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 473f1a230fc3..20063c3409fa 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -17,7 +17,14 @@ jobs: distribution: 'adopt' - name: Build with Ant run: ant -noinput -buildfile build.xml jar -Duse.jdk11=true -Drat.skip=true - - uses: actions/upload-artifact@v3 + - name: release + uses: actions/create-release@v1 + id: create_release with: - name: Package - path: build \ No newline at end of file + draft: false + prerelease: false + release_name: ${{ steps.version.outputs.version }} + tag_name: ${{ github.ref }} + body_path: CHANGELOG.md + env: + GITHUB_TOKEN: ${{ github.token }} \ No newline at end of file From 1163298aaea7b8a8b93af457c41ed6d9b891a5a1 Mon Sep 17 00:00:00 2001 From: Rahul Singh Date: Wed, 28 Dec 2022 18:35:19 +0530 Subject: [PATCH 08/37] release in workflow --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 20063c3409fa..f6c26909e433 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -25,6 +25,6 @@ jobs: prerelease: false release_name: ${{ steps.version.outputs.version }} tag_name: ${{ github.ref }} - body_path: CHANGELOG.md + body_path: CONTRIBUTING.md env: GITHUB_TOKEN: ${{ github.token }} \ No newline at end of file From a2430d4f6b853c1014ea2d821e8ec05680e0d6fd Mon Sep 17 00:00:00 2001 From: Rahul Singh Date: Wed, 28 Dec 2022 18:45:02 +0530 Subject: [PATCH 09/37] updated release name --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f6c26909e433..92d5c44f03b7 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -23,7 +23,7 @@ jobs: with: draft: false prerelease: false - release_name: ${{ steps.version.outputs.version }} + release_name: Release ${{ github.ref }} tag_name: ${{ github.ref }} body_path: CONTRIBUTING.md env: From a40664a47e0f8bba9929b9b5a4258dfbbd62e44e Mon Sep 17 00:00:00 2001 From: Rahul Singh Date: Wed, 28 Dec 2022 18:52:04 +0530 Subject: [PATCH 10/37] Added the new version --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 92d5c44f03b7..c3ca16de0909 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -4,7 +4,7 @@ on: branches: - master - main - - juspay-4.1 + - juspay-4.2 jobs: build: runs-on: ubuntu-latest From 1b0e5d867da41e9a3a8c3889ba0f1b8145c4a671 Mon Sep 17 00:00:00 2001 From: Rahul Singh Date: Thu, 5 Jan 2023 17:24:36 +0530 Subject: [PATCH 11/37] updated allocate --- build.xml | 6 +- .../cassandra/config/AllocateAddress.java | 98 +++++++++++++++++++ 2 files changed, 103 insertions(+), 1 deletion(-) create mode 100644 src/java/org/apache/cassandra/config/AllocateAddress.java diff --git a/build.xml b/build.xml index 74751c9b1db8..18ffb3e4cf1b 100644 --- a/build.xml +++ b/build.xml @@ -517,6 +517,8 @@ + + @@ -786,6 +788,8 @@ + + @@ -2365,4 +2369,4 @@ - + \ No newline at end of file diff --git a/src/java/org/apache/cassandra/config/AllocateAddress.java b/src/java/org/apache/cassandra/config/AllocateAddress.java new file mode 100644 index 000000000000..63b3ec4f9085 --- /dev/null +++ b/src/java/org/apache/cassandra/config/AllocateAddress.java @@ -0,0 +1,98 @@ +package org.apache.cassandra.config; + +import software.amazon.awssdk.auth.credentials.ProfileCredentialsProvider; +import software.amazon.awssdk.regions.Region; +import software.amazon.awssdk.services.ec2.Ec2Client; +import software.amazon.awssdk.services.ec2.model.AllocateAddressRequest; +import software.amazon.awssdk.services.ec2.model.DomainType; +import software.amazon.awssdk.services.ec2.model.AllocateAddressResponse; +import software.amazon.awssdk.services.ec2.model.AssociateAddressRequest; +import software.amazon.awssdk.services.ec2.model.AssociateAddressResponse; +import software.amazon.awssdk.services.ec2.model.Ec2Exception; +import software.amazon.awssdk.services.ec2.model.DescribeAddressesResponse; +import software.amazon.awssdk.services.ec2.model.DescribeAddressesRequest; +import software.amazon.awssdk.services.ec2.model.Filter; +import software.amazon.awssdk.services.ec2.model.Address; +import java.util.Arrays; +import java.util.Collection; +import software.amazon.awssdk.regions.internal.util.EC2MetadataUtils; + +// import software.amazon.awssdk.http.ApacheHttpClient; +// import com.amazonaws.util.EC2MetadataUtils; +// import com.amazonaws.services.ec2.model.Address; +// import com.amazonaws.services.ec2.model.DescribeAddressesResult; + +// snippet-end:[ec2.java2.allocate_address.import] + +/** + * Before running this Java V2 code example, set up your development environment, including your credentials. + * + * For more information, see the following documentation topic: + * + * https://docs.aws.amazon.com/sdk-for-java/latest/developer-guide/get-started.html + */ +public class AllocateAddress { + public static String allocateAddress() { + try { + String instanceId = EC2MetadataUtils.getInstanceId(); // "i-0a17b1a5f2662ecac"; + Region region = Region.AP_NORTHEAST_1; + Ec2Client ec2 = Ec2Client.builder() + .region(region) + .credentialsProvider(ProfileCredentialsProvider.create()) + .build(); + Collection filterValues = Arrays.asList("cassandra"); + Filter filter = Filter.builder().name("tag:cluster").values(filterValues).build(); + Collection filters = Arrays.asList(filter); + DescribeAddressesRequest addressRequest = DescribeAddressesRequest.builder().filters(filters).build(); + DescribeAddressesResponse response = ec2.describeAddresses(); + + + for(Address address : response.addresses()) { + if (address.instanceId() == null){ + System.out.printf( + "Found address with public IP %s, " + + "domain %s, " + + "allocation id %s " + + "associationId %s " + + "and NIC id %s", + address.publicIp(), + address.domainAsString(), + address.allocationId(), + address.instanceId(), + address.networkInterfaceId()); + AssociateAddressRequest associateRequest = AssociateAddressRequest.builder() + .instanceId(instanceId) + .allocationId(address.allocationId()) + .build(); + try { + AssociateAddressResponse associateResponse = ec2.associateAddress(associateRequest); + break; + } + catch (Ec2Exception e) { + continue; + } + } + } + + // AllocateAddressRequest allocateRequest = AllocateAddressRequest.builder() + // .domain(DomainType.VPC) + // .build(); + + // AllocateAddressResponse allocateResponse = ec2.allocateAddress(allocateRequest); + // String allocationId = allocateResponse.allocationId(); + // AssociateAddressRequest associateRequest = AssociateAddressRequest.builder() + // .instanceId(instanceId) + // .allocationId(allocationId) + // .build(); + + // AssociateAddressResponse associateResponse = ec2.associateAddress(associateRequest); + ec2.close(); + + return ""; + + } catch (Ec2Exception e) { + System.err.println(e.awsErrorDetails().errorMessage()); + } + return ""; + } +} \ No newline at end of file From 21de92718bfe095c16d9657094bae9527a8fdeee Mon Sep 17 00:00:00 2001 From: Rahul Singh Date: Thu, 5 Jan 2023 17:25:24 +0530 Subject: [PATCH 12/37] updated database descriptor --- .../cassandra/config/DatabaseDescriptor.java | 33 +++++++------------ 1 file changed, 11 insertions(+), 22 deletions(-) diff --git a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java index 62d1acdada0d..f79ad2c29008 100644 --- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java +++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java @@ -89,6 +89,7 @@ import org.apache.cassandra.service.CacheService.CacheType; import org.apache.cassandra.service.paxos.Paxos; import org.apache.cassandra.utils.FBUtilities; +import org.apache.cassandra.config.AllocateAddress; import static org.apache.cassandra.config.CassandraRelevantProperties.OS_ARCH; import static org.apache.cassandra.config.CassandraRelevantProperties.SUN_ARCH_DATA_MODEL; @@ -202,6 +203,9 @@ public static void daemonInitialization(Supplier config) throws Configur setConfig(config.get()); applyAll(); + System.out.println("$$$$$$$$$$$$$$$$$$$$$$$$$"); + AllocateAddress.allocateAddress(); + System.out.println("$$$$$$$$$$$$$$$$$$$$$$$$$"); AuthConfig.applyAuth(); } @@ -1039,35 +1043,20 @@ public static void applyAddressConfig() throws ConfigurationException public static void applyAddressConfig(Config config) throws ConfigurationException { - listenAddress = null; + // listenAddress = null; rpcAddress = null; broadcastAddress = null; broadcastRpcAddress = null; - - /* Local IP, hostname or interface to bind services to */ - if (config.listen_address != null && config.listen_interface != null) + try { - throw new ConfigurationException("Set listen_address OR listen_interface, not both", false); + listenAddress = InetAddress.getLocalHost(); + rpcAddress = listenAddress; } - else if (config.listen_address != null) - { - try - { - listenAddress = InetAddress.getByName(config.listen_address); - } - catch (UnknownHostException e) - { - throw new ConfigurationException("Unknown listen_address '" + config.listen_address + '\'', false); - } - - if (listenAddress.isAnyLocalAddress()) - throw new ConfigurationException("listen_address cannot be a wildcard address (" + config.listen_address + ")!", false); - } - else if (config.listen_interface != null) + catch (UnknownHostException e) { - listenAddress = getNetworkInterfaceAddress(config.listen_interface, "listen_interface", config.listen_interface_prefer_ipv6); + throw new ConfigurationException("Unknown broadcast_address '" + config.broadcast_address + '\'', false); } - + /* Gossip Address to broadcast */ if (config.broadcast_address != null) { From 141e63821bea481e4a6682d3f1d6c2fc1001bce1 Mon Sep 17 00:00:00 2001 From: Rahul Singh Date: Fri, 6 Jan 2023 12:21:07 +0530 Subject: [PATCH 13/37] Added the reasociation flag false --- .../cassandra/config/AllocateAddress.java | 29 ++++--------------- 1 file changed, 5 insertions(+), 24 deletions(-) diff --git a/src/java/org/apache/cassandra/config/AllocateAddress.java b/src/java/org/apache/cassandra/config/AllocateAddress.java index 63b3ec4f9085..efd29437489c 100644 --- a/src/java/org/apache/cassandra/config/AllocateAddress.java +++ b/src/java/org/apache/cassandra/config/AllocateAddress.java @@ -22,15 +22,6 @@ // import com.amazonaws.services.ec2.model.Address; // import com.amazonaws.services.ec2.model.DescribeAddressesResult; -// snippet-end:[ec2.java2.allocate_address.import] - -/** - * Before running this Java V2 code example, set up your development environment, including your credentials. - * - * For more information, see the following documentation topic: - * - * https://docs.aws.amazon.com/sdk-for-java/latest/developer-guide/get-started.html - */ public class AllocateAddress { public static String allocateAddress() { try { @@ -38,7 +29,7 @@ public static String allocateAddress() { Region region = Region.AP_NORTHEAST_1; Ec2Client ec2 = Ec2Client.builder() .region(region) - .credentialsProvider(ProfileCredentialsProvider.create()) + // .credentialsProvider(ProfileCredentialsProvider.create()) .build(); Collection filterValues = Arrays.asList("cassandra"); Filter filter = Filter.builder().name("tag:cluster").values(filterValues).build(); @@ -49,21 +40,11 @@ public static String allocateAddress() { for(Address address : response.addresses()) { if (address.instanceId() == null){ - System.out.printf( - "Found address with public IP %s, " + - "domain %s, " + - "allocation id %s " + - "associationId %s " + - "and NIC id %s", - address.publicIp(), - address.domainAsString(), - address.allocationId(), - address.instanceId(), - address.networkInterfaceId()); AssociateAddressRequest associateRequest = AssociateAddressRequest.builder() - .instanceId(instanceId) - .allocationId(address.allocationId()) - .build(); + .allowReassociation(false) + .instanceId(instanceId) + .allocationId(address.allocationId()) + .build(); try { AssociateAddressResponse associateResponse = ec2.associateAddress(associateRequest); break; From bb91cf664200aa4590bf0d1d147d7ac0d3a891f6 Mon Sep 17 00:00:00 2001 From: Rahul Singh Date: Fri, 6 Jan 2023 16:44:50 +0530 Subject: [PATCH 14/37] Added artifact --- .github/workflows/main.yml | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c3ca16de0909..1f7c15e5f8ae 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -4,7 +4,7 @@ on: branches: - master - main - - juspay-4.2 + - juspay-4.2.0.0 jobs: build: runs-on: ubuntu-latest @@ -27,4 +27,13 @@ jobs: tag_name: ${{ github.ref }} body_path: CONTRIBUTING.md env: - GITHUB_TOKEN: ${{ github.token }} \ No newline at end of file + GITHUB_TOKEN: ${{ github.token }} + - name: upload artifact + uses: actions/upload-release-asset@v1 + env: + GITHUB_TOKEN: ${{ github.token }} + with: + upload_url: ${{ steps.create_release.outputs.upload_url }} + asset_path: ./build/apache-cassandra-4.1.1-SNAPSHOT.jar + asset_name: apache-cassandra-4.1.1-SNAPSHOT.jar + asset_content_type: application/gzip \ No newline at end of file From 706f8617baf6d32395b19e6139236536f2fe8063 Mon Sep 17 00:00:00 2001 From: Rahul Singh Date: Fri, 6 Jan 2023 17:50:10 +0530 Subject: [PATCH 15/37] Addeed zip in workflow --- .github/workflows/main.yml | 40 +++++++++++++++++++++++++++++--------- 1 file changed, 31 insertions(+), 9 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 1f7c15e5f8ae..bd38673da5a1 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -4,7 +4,7 @@ on: branches: - master - main - - juspay-4.2.0.0 + - juspay-4.2.0.0.0 jobs: build: runs-on: ubuntu-latest @@ -28,12 +28,34 @@ jobs: body_path: CONTRIBUTING.md env: GITHUB_TOKEN: ${{ github.token }} - - name: upload artifact - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ github.token }} + - name: Copy files + run: | + mkdir -p apache-cassandra-juspay-4.1 + cp -R bin apache-cassandra-juspay-4.1 + cp -R build/tools apache-cassandra-juspay-4.1 + cp -R pylib apache-cassandra-juspay-4.1 + cp -R conf apache-cassandra-juspay-4.1 + cp -R doc apache-cassandra-juspay-4.1 + cp -R lib apache-cassandra-juspay-4.1 + cp -R build/apache-cassandra-4.1.1-SNAPSHOT.jar apache-cassandra-juspay-4.1/lib + - name: Compress + uses: a7ul/tar-action@v1.1.0 + id: compress + with: + command: c + cwd: ./apache-cassandra-juspay-4.1 + files: | + ./* + outPath: apache-cassandra-juspay-4.1.tar.gz + - uses: actions/upload-artifact@v3 with: - upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: ./build/apache-cassandra-4.1.1-SNAPSHOT.jar - asset_name: apache-cassandra-4.1.1-SNAPSHOT.jar - asset_content_type: application/gzip \ No newline at end of file + path: ./apache-cassandra-juspay-4.1.tar.gz + # - name: upload artifact + # uses: actions/upload-release-asset@v1 + # env: + # GITHUB_TOKEN: ${{ github.token }} + # with: + # upload_url: ${{ steps.create_release.outputs.upload_url }} + # asset_path: ./build/apache-cassandra-4.1.1-SNAPSHOT.jar + # asset_name: apache-cassandra-4.1.1-SNAPSHOT.jar + # asset_content_type: application/gzip \ No newline at end of file From 41549a574f7a4410d6ef1788f5185428cea753ec Mon Sep 17 00:00:00 2001 From: Rahul Singh Date: Fri, 6 Jan 2023 17:54:14 +0530 Subject: [PATCH 16/37] Addeed zip in workflow --- .github/workflows/main.yml | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index bd38673da5a1..a3bb3867eaf8 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -17,17 +17,6 @@ jobs: distribution: 'adopt' - name: Build with Ant run: ant -noinput -buildfile build.xml jar -Duse.jdk11=true -Drat.skip=true - - name: release - uses: actions/create-release@v1 - id: create_release - with: - draft: false - prerelease: false - release_name: Release ${{ github.ref }} - tag_name: ${{ github.ref }} - body_path: CONTRIBUTING.md - env: - GITHUB_TOKEN: ${{ github.token }} - name: Copy files run: | mkdir -p apache-cassandra-juspay-4.1 @@ -39,14 +28,25 @@ jobs: cp -R lib apache-cassandra-juspay-4.1 cp -R build/apache-cassandra-4.1.1-SNAPSHOT.jar apache-cassandra-juspay-4.1/lib - name: Compress - uses: a7ul/tar-action@v1.1.0 - id: compress - with: - command: c - cwd: ./apache-cassandra-juspay-4.1 - files: | - ./* - outPath: apache-cassandra-juspay-4.1.tar.gz + uses: a7ul/tar-action@v1.1.0 + id: compress + with: + command: c + cwd: ./apache-cassandra-juspay-4.1 + files: | + ./* + outPath: apache-cassandra-juspay-4.1.tar.gz + - name: release + uses: actions/create-release@v1 + id: create_release + with: + draft: false + prerelease: false + release_name: Release ${{ github.ref }} + tag_name: ${{ github.ref }} + body_path: CONTRIBUTING.md + env: + GITHUB_TOKEN: ${{ github.token }} - uses: actions/upload-artifact@v3 with: path: ./apache-cassandra-juspay-4.1.tar.gz From 7936632c6cdb83efaa670ef266ae6a6ec9f590d8 Mon Sep 17 00:00:00 2001 From: Rahul Singh Date: Fri, 6 Jan 2023 18:00:02 +0530 Subject: [PATCH 17/37] Addeed zip in workflow --- .github/workflows/main.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a3bb3867eaf8..8ce2cc41a34c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -32,9 +32,7 @@ jobs: id: compress with: command: c - cwd: ./apache-cassandra-juspay-4.1 - files: | - ./* + cwd: apache-cassandra-juspay-4.1 outPath: apache-cassandra-juspay-4.1.tar.gz - name: release uses: actions/create-release@v1 From 873634d3bceda25d6a649c7d429ba17dba6d88b0 Mon Sep 17 00:00:00 2001 From: Rahul Singh Date: Fri, 6 Jan 2023 18:03:25 +0530 Subject: [PATCH 18/37] Compress test --- .github/workflows/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 8ce2cc41a34c..d0b9720e5b5d 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -33,6 +33,7 @@ jobs: with: command: c cwd: apache-cassandra-juspay-4.1 + files: ./ outPath: apache-cassandra-juspay-4.1.tar.gz - name: release uses: actions/create-release@v1 From 8cfdaed78e4d3282fccc607a4e3c485bd7313a64 Mon Sep 17 00:00:00 2001 From: Rahul Singh Date: Fri, 6 Jan 2023 18:11:47 +0530 Subject: [PATCH 19/37] Compress test 2 --- .github/workflows/main.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d0b9720e5b5d..4dc1656342e7 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -46,15 +46,15 @@ jobs: body_path: CONTRIBUTING.md env: GITHUB_TOKEN: ${{ github.token }} - - uses: actions/upload-artifact@v3 - with: - path: ./apache-cassandra-juspay-4.1.tar.gz - # - name: upload artifact - # uses: actions/upload-release-asset@v1 - # env: - # GITHUB_TOKEN: ${{ github.token }} + # - uses: actions/upload-artifact@v3 # with: - # upload_url: ${{ steps.create_release.outputs.upload_url }} - # asset_path: ./build/apache-cassandra-4.1.1-SNAPSHOT.jar - # asset_name: apache-cassandra-4.1.1-SNAPSHOT.jar - # asset_content_type: application/gzip \ No newline at end of file + # path: ./apache-cassandra-juspay-4.1.tar.gz + - name: upload artifact + uses: actions/upload-release-asset@v1 + env: + GITHUB_TOKEN: ${{ github.token }} + with: + upload_url: ${{ steps.create_release.outputs.upload_url }} + asset_path: ./apache-cassandra-juspay-4.1.tar.gz + asset_name: apache-cassandra-juspay-4.1.tar.gz + asset_content_type: application/gzip \ No newline at end of file From c165c1ee5a407f153ab455cb93965aa0001e5c1b Mon Sep 17 00:00:00 2001 From: Rahul Singh Date: Fri, 6 Jan 2023 18:12:50 +0530 Subject: [PATCH 20/37] Compress test 2 --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 4dc1656342e7..f24ac4f1a0ff 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -4,7 +4,7 @@ on: branches: - master - main - - juspay-4.2.0.0.0 + - juspay-4.2.1.0 jobs: build: runs-on: ubuntu-latest From e51952cef458f396763e65d0cf1c1614ca1d52b3 Mon Sep 17 00:00:00 2001 From: Rahul Singh Date: Fri, 6 Jan 2023 18:19:44 +0530 Subject: [PATCH 21/37] with jar test --- .github/workflows/main.yml | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f24ac4f1a0ff..2be76039b77c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -46,9 +46,6 @@ jobs: body_path: CONTRIBUTING.md env: GITHUB_TOKEN: ${{ github.token }} - # - uses: actions/upload-artifact@v3 - # with: - # path: ./apache-cassandra-juspay-4.1.tar.gz - name: upload artifact uses: actions/upload-release-asset@v1 env: @@ -57,4 +54,12 @@ jobs: upload_url: ${{ steps.create_release.outputs.upload_url }} asset_path: ./apache-cassandra-juspay-4.1.tar.gz asset_name: apache-cassandra-juspay-4.1.tar.gz - asset_content_type: application/gzip \ No newline at end of file + asset_content_type: application/gzip + - name: upload artifact jar + uses: actions/upload-release-asset@v1 + env: + GITHUB_TOKEN: ${{ github.token }} + with: + upload_url: ${{ steps.create_release.outputs.upload_url }} + asset_path: ./build/apache-cassandra-4.1.1-SNAPSHOT.jar + asset_name: apache-cassandra-4.1.1.jar \ No newline at end of file From 5872ac066d22728a0e047f345da3cdf7a981a306 Mon Sep 17 00:00:00 2001 From: Rahul Singh Date: Fri, 6 Jan 2023 18:21:17 +0530 Subject: [PATCH 22/37] with jar test --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2be76039b77c..c73b03e895dd 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -4,7 +4,7 @@ on: branches: - master - main - - juspay-4.2.1.0 + - juspay-4.2.1.1 jobs: build: runs-on: ubuntu-latest From 88ccf9802de6a21cf8ca7173e57b49914100204e Mon Sep 17 00:00:00 2001 From: Rahul Singh Date: Fri, 6 Jan 2023 18:25:52 +0530 Subject: [PATCH 23/37] with jar test 2 --- .github/workflows/main.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c73b03e895dd..b85ba468ae9d 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -62,4 +62,5 @@ jobs: with: upload_url: ${{ steps.create_release.outputs.upload_url }} asset_path: ./build/apache-cassandra-4.1.1-SNAPSHOT.jar - asset_name: apache-cassandra-4.1.1.jar \ No newline at end of file + asset_name: apache-cassandra-4.1.1.jar + asset_content_type: application/java-archive \ No newline at end of file From db3aa5d396159487000d001b49dbb78d5ff0a455 Mon Sep 17 00:00:00 2001 From: Rahul Singh Date: Fri, 6 Jan 2023 18:26:19 +0530 Subject: [PATCH 24/37] with jar test 3 --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b85ba468ae9d..aade856096a0 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -4,7 +4,7 @@ on: branches: - master - main - - juspay-4.2.1.1 + - juspay-4.2.1.2 jobs: build: runs-on: ubuntu-latest From bd406ff8aa2703d5611f0835515ccf2d4dbc08f1 Mon Sep 17 00:00:00 2001 From: Rahul Singh Date: Fri, 6 Jan 2023 18:29:41 +0530 Subject: [PATCH 25/37] Added the tag name --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index aade856096a0..8bfbba1f4683 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -41,8 +41,8 @@ jobs: with: draft: false prerelease: false - release_name: Release ${{ github.ref }} - tag_name: ${{ github.ref }} + release_name: Release Juspay-cassandra-4.2 + tag_name: Juspay-cassandra-4.2 body_path: CONTRIBUTING.md env: GITHUB_TOKEN: ${{ github.token }} From 5d13d07860369ebaf5490f3db1edebfc4f2e3501 Mon Sep 17 00:00:00 2001 From: Rahul Singh Date: Fri, 6 Jan 2023 18:30:17 +0530 Subject: [PATCH 26/37] version --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 8bfbba1f4683..ced226d013ba 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -4,7 +4,7 @@ on: branches: - master - main - - juspay-4.2.1.2 + - juspay-4.3 jobs: build: runs-on: ubuntu-latest From 8f14529088facb0678146cf53339f01eebdf0569 Mon Sep 17 00:00:00 2001 From: Rahul Singh Date: Fri, 6 Jan 2023 18:33:40 +0530 Subject: [PATCH 27/37] push test --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ced226d013ba..43fa06c06099 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -62,5 +62,5 @@ jobs: with: upload_url: ${{ steps.create_release.outputs.upload_url }} asset_path: ./build/apache-cassandra-4.1.1-SNAPSHOT.jar - asset_name: apache-cassandra-4.1.1.jar + asset_name: apache-cassandra-4.1.jar asset_content_type: application/java-archive \ No newline at end of file From b7c1184a58188830548d5d9d8225aa63792ca0b1 Mon Sep 17 00:00:00 2001 From: Rahul Singh Date: Mon, 9 Jan 2023 12:21:05 +0530 Subject: [PATCH 28/37] Specific packages --- build.xml | 4 ++-- src/java/org/apache/cassandra/locator/HttpSeedProvider.java | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/build.xml b/build.xml index 18ffb3e4cf1b..f35f8201b1b1 100644 --- a/build.xml +++ b/build.xml @@ -517,7 +517,7 @@ - + @@ -788,7 +788,7 @@ - + diff --git a/src/java/org/apache/cassandra/locator/HttpSeedProvider.java b/src/java/org/apache/cassandra/locator/HttpSeedProvider.java index d473351f24e8..e2a60182c704 100644 --- a/src/java/org/apache/cassandra/locator/HttpSeedProvider.java +++ b/src/java/org/apache/cassandra/locator/HttpSeedProvider.java @@ -100,6 +100,8 @@ public List getSeeds() .header("accept", "application/json") .build(); var response = client.send(request, BodyHandlers.ofString()); + System.out.println(response.body()); + String[] hosts = response.body().replace("\"", "").split(",", -1); seeds = new ArrayList<>(hosts.length); for (String host : hosts) From 4a2290122746bed3f0f0a1fd5c2bb8b026254407 Mon Sep 17 00:00:00 2001 From: Rahul Singh Date: Mon, 9 Jan 2023 12:24:12 +0530 Subject: [PATCH 29/37] new release --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 43fa06c06099..cb7ab467333a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -41,8 +41,8 @@ jobs: with: draft: false prerelease: false - release_name: Release Juspay-cassandra-4.2 - tag_name: Juspay-cassandra-4.2 + release_name: Release Juspay-cassandra-4.3 + tag_name: Juspay-cassandra-4.3 body_path: CONTRIBUTING.md env: GITHUB_TOKEN: ${{ github.token }} From 469ef517f521fed1afce116762d172ba61a3c2b3 Mon Sep 17 00:00:00 2001 From: Rahul Singh Date: Mon, 9 Jan 2023 14:34:04 +0530 Subject: [PATCH 30/37] Added the commit id --- .github/workflows/main.yml | 39 +++++++++++++++----------------------- 1 file changed, 15 insertions(+), 24 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index cb7ab467333a..6d75a34f59b1 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -19,30 +19,30 @@ jobs: run: ant -noinput -buildfile build.xml jar -Duse.jdk11=true -Drat.skip=true - name: Copy files run: | - mkdir -p apache-cassandra-juspay-4.1 - cp -R bin apache-cassandra-juspay-4.1 - cp -R build/tools apache-cassandra-juspay-4.1 - cp -R pylib apache-cassandra-juspay-4.1 - cp -R conf apache-cassandra-juspay-4.1 - cp -R doc apache-cassandra-juspay-4.1 - cp -R lib apache-cassandra-juspay-4.1 - cp -R build/apache-cassandra-4.1.1-SNAPSHOT.jar apache-cassandra-juspay-4.1/lib + mkdir -p apache-cassandra-juspay + cp -R bin apache-cassandra-juspay + cp -R build/tools apache-cassandra-juspay + cp -R pylib apache-cassandra-juspay + cp -R conf apache-cassandra-juspay + cp -R doc apache-cassandra-juspay + cp -R lib apache-cassandra-juspay + cp -R build/apache-cassandra-4.1.1-SNAPSHOT.jar apache-cassandra-juspay/lib - name: Compress uses: a7ul/tar-action@v1.1.0 id: compress with: command: c - cwd: apache-cassandra-juspay-4.1 + cwd: apache-cassandra-juspay files: ./ - outPath: apache-cassandra-juspay-4.1.tar.gz + outPath: apache-cassandra-release-${{github.event.pull_request.head.sha}}.tar.gz - name: release uses: actions/create-release@v1 id: create_release with: draft: false prerelease: false - release_name: Release Juspay-cassandra-4.3 - tag_name: Juspay-cassandra-4.3 + release_name: Release Juspay-cassandra-${{github.event.pull_request.head.sha}} + tag_name: Juspay-cassandra-${{github.event.pull_request.head.sha}} body_path: CONTRIBUTING.md env: GITHUB_TOKEN: ${{ github.token }} @@ -52,15 +52,6 @@ jobs: GITHUB_TOKEN: ${{ github.token }} with: upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: ./apache-cassandra-juspay-4.1.tar.gz - asset_name: apache-cassandra-juspay-4.1.tar.gz - asset_content_type: application/gzip - - name: upload artifact jar - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ github.token }} - with: - upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: ./build/apache-cassandra-4.1.1-SNAPSHOT.jar - asset_name: apache-cassandra-4.1.jar - asset_content_type: application/java-archive \ No newline at end of file + asset_path: ./apache-cassandra-release-${{github.event.pull_request.head.sha}}.tar.gz + asset_name: apache-cassandra-release-${{github.event.pull_request.head.sha}}.tar.gz + asset_content_type: application/gzip \ No newline at end of file From 1d3bef12ee8fa3ea934eefb9f439cdea757036ad Mon Sep 17 00:00:00 2001 From: Rahul Singh Date: Mon, 9 Jan 2023 14:41:14 +0530 Subject: [PATCH 31/37] Added the spaces --- .github/workflows/main.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 6d75a34f59b1..6902885e92e2 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -34,15 +34,15 @@ jobs: command: c cwd: apache-cassandra-juspay files: ./ - outPath: apache-cassandra-release-${{github.event.pull_request.head.sha}}.tar.gz + outPath: apache-cassandra-release-${{ github.event.pull_request.head.sha }}.tar.gz - name: release uses: actions/create-release@v1 id: create_release with: draft: false prerelease: false - release_name: Release Juspay-cassandra-${{github.event.pull_request.head.sha}} - tag_name: Juspay-cassandra-${{github.event.pull_request.head.sha}} + release_name: Release Juspay-cassandra-${{ github.event.pull_request.head.sha }} + tag_name: Juspay-cassandra-${{ github.event.pull_request.head.sha }} body_path: CONTRIBUTING.md env: GITHUB_TOKEN: ${{ github.token }} @@ -52,6 +52,6 @@ jobs: GITHUB_TOKEN: ${{ github.token }} with: upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: ./apache-cassandra-release-${{github.event.pull_request.head.sha}}.tar.gz - asset_name: apache-cassandra-release-${{github.event.pull_request.head.sha}}.tar.gz + asset_path: ./apache-cassandra-release-${{ github.event.pull_request.head.sha }}.tar.gz + asset_name: apache-cassandra-release-${{ github.event.pull_request.head.sha }}.tar.gz asset_content_type: application/gzip \ No newline at end of file From f51d0869378ce298c05c9bb1cbeb9a7863d04045 Mon Sep 17 00:00:00 2001 From: Rahul Singh Date: Mon, 9 Jan 2023 14:47:03 +0530 Subject: [PATCH 32/37] Added git --- .github/workflows/main.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 6902885e92e2..53ee2e73a48f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -34,15 +34,15 @@ jobs: command: c cwd: apache-cassandra-juspay files: ./ - outPath: apache-cassandra-release-${{ github.event.pull_request.head.sha }}.tar.gz + outPath: apache-cassandra-release-$(git rev-parse HEAD).tar.gz - name: release uses: actions/create-release@v1 id: create_release with: draft: false prerelease: false - release_name: Release Juspay-cassandra-${{ github.event.pull_request.head.sha }} - tag_name: Juspay-cassandra-${{ github.event.pull_request.head.sha }} + release_name: Release Juspay-cassandra-$(git rev-parse HEAD) + tag_name: Juspay-cassandra-$(git rev-parse HEAD) body_path: CONTRIBUTING.md env: GITHUB_TOKEN: ${{ github.token }} @@ -52,6 +52,6 @@ jobs: GITHUB_TOKEN: ${{ github.token }} with: upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: ./apache-cassandra-release-${{ github.event.pull_request.head.sha }}.tar.gz - asset_name: apache-cassandra-release-${{ github.event.pull_request.head.sha }}.tar.gz + asset_path: ./apache-cassandra-release-$(git rev-parse HEAD).tar.gz + asset_name: apache-cassandra-release-$(git rev-parse HEAD).tar.gz asset_content_type: application/gzip \ No newline at end of file From e3d5a80a8a3a78e94a67858268f5608e5d5ff897 Mon Sep 17 00:00:00 2001 From: Rahul Singh Date: Mon, 9 Jan 2023 14:49:47 +0530 Subject: [PATCH 33/37] Added git --- .github/workflows/main.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 53ee2e73a48f..c7fbf177c1d3 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -34,15 +34,15 @@ jobs: command: c cwd: apache-cassandra-juspay files: ./ - outPath: apache-cassandra-release-$(git rev-parse HEAD).tar.gz + outPath: apache-cassandra-release-${{git rev-parse HEAD}}.tar.gz - name: release uses: actions/create-release@v1 id: create_release with: draft: false prerelease: false - release_name: Release Juspay-cassandra-$(git rev-parse HEAD) - tag_name: Juspay-cassandra-$(git rev-parse HEAD) + release_name: Release Juspay-cassandra-${{git rev-parse HEAD}} + tag_name: Juspay-cassandra-${{git rev-parse HEAD}} body_path: CONTRIBUTING.md env: GITHUB_TOKEN: ${{ github.token }} @@ -52,6 +52,6 @@ jobs: GITHUB_TOKEN: ${{ github.token }} with: upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: ./apache-cassandra-release-$(git rev-parse HEAD).tar.gz - asset_name: apache-cassandra-release-$(git rev-parse HEAD).tar.gz + asset_path: ./apache-cassandra-release-${{git rev-parse HEAD}}.tar.gz + asset_name: apache-cassandra-release-${{git rev-parse HEAD}}.tar.gz asset_content_type: application/gzip \ No newline at end of file From 8cfdf211e493f2a8da9f55bfb7ea7c13bf93d2e9 Mon Sep 17 00:00:00 2001 From: Rahul Singh Date: Mon, 9 Jan 2023 15:11:19 +0530 Subject: [PATCH 34/37] Added git sha --- .github/workflows/main.yml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c7fbf177c1d3..0823c119fc31 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -10,6 +10,8 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 + env: + message: ${{ github.event.head_commit.message }} - name: Set up JDK 11 uses: actions/setup-java@v3 with: @@ -34,15 +36,15 @@ jobs: command: c cwd: apache-cassandra-juspay files: ./ - outPath: apache-cassandra-release-${{git rev-parse HEAD}}.tar.gz + outPath: apache-cassandra-release-${{ github.sha }}.tar.gz - name: release uses: actions/create-release@v1 id: create_release with: draft: false prerelease: false - release_name: Release Juspay-cassandra-${{git rev-parse HEAD}} - tag_name: Juspay-cassandra-${{git rev-parse HEAD}} + release_name: Release Juspay-cassandra-${{ github.sha }} + tag_name: Juspay-cassandra-${{ github.sha }} body_path: CONTRIBUTING.md env: GITHUB_TOKEN: ${{ github.token }} @@ -52,6 +54,6 @@ jobs: GITHUB_TOKEN: ${{ github.token }} with: upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: ./apache-cassandra-release-${{git rev-parse HEAD}}.tar.gz - asset_name: apache-cassandra-release-${{git rev-parse HEAD}}.tar.gz + asset_path: ./apache-cassandra-release-${{ github.sha }}.tar.gz + asset_name: apache-cassandra-release-${{ github.sha }}.tar.gz asset_content_type: application/gzip \ No newline at end of file From a35821fe1877b65ddff0b307ba6f64486dbc910b Mon Sep 17 00:00:00 2001 From: Rahul Singh Date: Mon, 9 Jan 2023 15:12:40 +0530 Subject: [PATCH 35/37] Added git sha --- .github/workflows/main.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 0823c119fc31..1435ef67f9e5 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -10,8 +10,6 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - env: - message: ${{ github.event.head_commit.message }} - name: Set up JDK 11 uses: actions/setup-java@v3 with: From 60ed09ccb15bd5aaed07ae917d33fd9d9474ccc7 Mon Sep 17 00:00:00 2001 From: Rahul Singh Date: Mon, 9 Jan 2023 15:38:13 +0530 Subject: [PATCH 36/37] short sha --- .github/workflows/main.yml | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 1435ef67f9e5..d98d16583338 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -10,6 +10,10 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 + - uses: benjlevesque/short-sha@v2.1 + id: short-sha + with: + length: 7 - name: Set up JDK 11 uses: actions/setup-java@v3 with: @@ -34,15 +38,15 @@ jobs: command: c cwd: apache-cassandra-juspay files: ./ - outPath: apache-cassandra-release-${{ github.sha }}.tar.gz + outPath: apache-cassandra-release-${{steps.short-sha.outputs.sha}}.tar.gz - name: release uses: actions/create-release@v1 id: create_release with: draft: false prerelease: false - release_name: Release Juspay-cassandra-${{ github.sha }} - tag_name: Juspay-cassandra-${{ github.sha }} + release_name: Release Juspay-cassandra-${{ steps.short-sha.outputs.sha }} + tag_name: Juspay-cassandra-${{ steps.short-sha.outputs.sha }} body_path: CONTRIBUTING.md env: GITHUB_TOKEN: ${{ github.token }} @@ -52,6 +56,6 @@ jobs: GITHUB_TOKEN: ${{ github.token }} with: upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: ./apache-cassandra-release-${{ github.sha }}.tar.gz - asset_name: apache-cassandra-release-${{ github.sha }}.tar.gz + asset_path: ./apache-cassandra-release-${{ steps.short-sha.outputs.sha }}.tar.gz + asset_name: apache-cassandra-release-${{ steps.short-sha.outputs.sha }}.tar.gz asset_content_type: application/gzip \ No newline at end of file From 9ac81ba24fe26390bddf656110bdaa32f471c791 Mon Sep 17 00:00:00 2001 From: Rahul Singh Date: Mon, 9 Jan 2023 15:43:25 +0530 Subject: [PATCH 37/37] Added the workflow changes' --- .github/workflows/main.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d98d16583338..62cc5b630f2a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -23,20 +23,20 @@ jobs: run: ant -noinput -buildfile build.xml jar -Duse.jdk11=true -Drat.skip=true - name: Copy files run: | - mkdir -p apache-cassandra-juspay - cp -R bin apache-cassandra-juspay - cp -R build/tools apache-cassandra-juspay - cp -R pylib apache-cassandra-juspay - cp -R conf apache-cassandra-juspay - cp -R doc apache-cassandra-juspay - cp -R lib apache-cassandra-juspay - cp -R build/apache-cassandra-4.1.1-SNAPSHOT.jar apache-cassandra-juspay/lib + mkdir -p apache-cassandra + cp -R bin apache-cassandra + cp -R build/tools apache-cassandra + cp -R pylib apache-cassandra + cp -R conf apache-cassandra + cp -R doc apache-cassandra + cp -R lib apache-cassandra + cp -R build/apache-cassandra-4.1.1-SNAPSHOT.jar apache-cassandra/lib - name: Compress uses: a7ul/tar-action@v1.1.0 id: compress with: command: c - cwd: apache-cassandra-juspay + cwd: apache-cassandra files: ./ outPath: apache-cassandra-release-${{steps.short-sha.outputs.sha}}.tar.gz - name: release @@ -45,8 +45,8 @@ jobs: with: draft: false prerelease: false - release_name: Release Juspay-cassandra-${{ steps.short-sha.outputs.sha }} - tag_name: Juspay-cassandra-${{ steps.short-sha.outputs.sha }} + release_name: Release apache-cassandra-${{ steps.short-sha.outputs.sha }} + tag_name: apache-cassandra-${{ steps.short-sha.outputs.sha }} body_path: CONTRIBUTING.md env: GITHUB_TOKEN: ${{ github.token }}