Juspay 4.2.0

.github/workflows/main.yml

@@ -0,0 +1,30 @@
+name: Cassandra Deployment
+on:
+  push:
+    branches:
+      - master
+      - main
+      - juspay-4.2
+jobs:
+  build:
+    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 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 }}

build.xml

@@ -517,6 +517,8 @@
             <exclusion groupId="org.checkerframework" artifactId="checker-qual" />
             <exclusion groupId="com.google.errorprone" artifactId="error_prone_annotations" />
           </dependency>
+          <dependency groupId="software.amazon.awssdk" artifactId="aws-sdk-java" version="2.19.9" />
+          <dependency groupId="software.amazon.awssdk" artifactId="apache-client" version="2.19.9" />
           <dependency groupId="com.google.jimfs" artifactId="jimfs" version="1.1"/>
           <dependency groupId="org.hdrhistogram" artifactId="HdrHistogram" version="2.1.9"/>
           <dependency groupId="commons-cli" artifactId="commons-cli" version="1.1"/>
@@ -786,6 +788,8 @@
         <scm connection="${scm.connection}" developerConnection="${scm.developerConnection}" url="${scm.url}"/>
         <dependency groupId="org.xerial.snappy" artifactId="snappy-java"/>
         <dependency groupId="org.lz4" artifactId="lz4-java"/>
+        <dependency groupId="software.amazon.awssdk" artifactId="aws-sdk-java" />
+        <dependency groupId="software.amazon.awssdk" artifactId="apache-client" />
         <dependency groupId="com.ning" artifactId="compress-lzf"/>
         <dependency groupId="com.google.guava" artifactId="guava"/>
         <dependency groupId="commons-cli" artifactId="commons-cli"/>
@@ -2365,4 +2369,4 @@
   <import file="${basedir}/.build/build-resolver.xml"/>
   <import file="${basedir}/.build/build-rat.xml"/>
   <import file="${basedir}/.build/build-owasp.xml"/>
-</project>
+</project>

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: "<ip1>,<ip2>,<ip3>"
-      - 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

src/java/org/apache/cassandra/config/AllocateAddress.java

@@ -0,0 +1,79 @@
+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;
+
+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<String> filterValues = Arrays.asList("cassandra");
+            Filter filter = Filter.builder().name("tag:cluster").values(filterValues).build();
+            Collection<Filter> filters = Arrays.asList(filter);
+            DescribeAddressesRequest addressRequest = DescribeAddressesRequest.builder().filters(filters).build();
+            DescribeAddressesResponse response = ec2.describeAddresses();
+
+
+            for(Address address : response.addresses()) {
+                if (address.instanceId() == null){
+                    AssociateAddressRequest associateRequest = AssociateAddressRequest.builder()
+                        .allowReassociation(false)
+                        .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 "";
+    }
+}

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> 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)
         {

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<W> implements HttpResponse.BodyHandler<Supplier<W>> {
+
+//     private final Class<W> wClass;
+
+//     public JsonBodyHandler(Class<W> wClass) {
+//         this.wClass = wClass;
+//     }
+
+//     public static <W> HttpResponse.BodySubscriber<Supplier<W>> asJSON(Class<W> targetType) {
+//         HttpResponse.BodySubscriber<InputStream> upstream = HttpResponse.BodySubscribers.ofInputStream();
+
+//         return HttpResponse.BodySubscribers.mapping(
+//                 upstream,
+//                 inputStream -> toSupplierOfType(inputStream, targetType));
+//     }
+
+//     public static <W> Supplier<W> toSupplierOfType(InputStream inputStream, Class<W> 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<Supplier<W>> 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<String, String> args) {}
+
+    public List<InetAddressAndPort> getSeeds()
+    {
+        Config conf;
+        List<InetAddressAndPort> 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);
+    }
+}

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:

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:

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:

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: