Browse Source

Fix TTL parameter in redis calls with EX

pull/36/head
Kristijan Mitrovic 4 years ago
parent
commit
7816656348
3 changed files with 5 additions and 5 deletions
  1. +3
    -3
      bubble-server/src/main/java/bubble/cloud/storage/s3/S3StorageDriver.java
  2. +1
    -1
      bubble-server/src/main/java/bubble/service/cloud/StorageStreamService.java
  3. +1
    -1
      bubble-server/src/main/java/bubble/service/upgrade/BubbleJarUpgradeService.java

+ 3
- 3
bubble-server/src/main/java/bubble/cloud/storage/s3/S3StorageDriver.java View File

@@ -50,7 +50,7 @@ import static org.cobbzilla.wizard.cache.redis.RedisService.EX;
public class S3StorageDriver extends StorageServiceDriverBase<S3StorageConfig> { public class S3StorageDriver extends StorageServiceDriverBase<S3StorageConfig> {


public static final long STALE_REQUEST_TIMEOUT = HOURS.toMillis(1); public static final long STALE_REQUEST_TIMEOUT = HOURS.toMillis(1);
public static final long LISTING_TIMEOUT = MINUTES.toMillis(10);
public static final long LISTING_IN_REDIS_TTL = MINUTES.toSeconds(10);


@Autowired private BubbleNodeDAO nodeDAO; @Autowired private BubbleNodeDAO nodeDAO;
@Autowired private RedisService redis; @Autowired private RedisService redis;
@@ -238,7 +238,7 @@ public class S3StorageDriver extends StorageServiceDriverBase<S3StorageConfig> {
listing.getObjectSummaries().forEach(o -> keys.add(o.getKey().substring(rootPrefix.length()))); listing.getObjectSummaries().forEach(o -> keys.add(o.getKey().substring(rootPrefix.length())));


final ListingRequest listingRequest = new ListingRequest(key, listing); final ListingRequest listingRequest = new ListingRequest(key, listing);
getActiveListings().set(listRequestId, json(listingRequest), EX, LISTING_TIMEOUT);
getActiveListings().set(listRequestId, json(listingRequest), EX, LISTING_IN_REDIS_TTL);


return new StorageListing() return new StorageListing()
.setListingId(listRequestId) .setListingId(listRequestId)
@@ -258,7 +258,7 @@ public class S3StorageDriver extends StorageServiceDriverBase<S3StorageConfig> {


listingRequest.objectListing = s3client.listNextBatchOfObjects(listingRequest.objectListing); listingRequest.objectListing = s3client.listNextBatchOfObjects(listingRequest.objectListing);
listingRequest.objectListing.getObjectSummaries().forEach(o -> keys.add(o.getKey().substring(rootPrefix.length()))); listingRequest.objectListing.getObjectSummaries().forEach(o -> keys.add(o.getKey().substring(rootPrefix.length())));
activeListings.set(listingId, json(listingRequest), EX, LISTING_TIMEOUT);
activeListings.set(listingId, json(listingRequest), EX, LISTING_IN_REDIS_TTL);


return new StorageListing() return new StorageListing()
.setListingId(listingId) .setListingId(listingId)


+ 1
- 1
bubble-server/src/main/java/bubble/service/cloud/StorageStreamService.java View File

@@ -31,7 +31,7 @@ import static org.cobbzilla.wizard.resources.ResourceUtil.notFoundEx;
@Service @Slf4j @Service @Slf4j
public class StorageStreamService { public class StorageStreamService {


public static final long TOKEN_TTL = SECONDS.toMillis(30);
public static final long TOKEN_TTL = SECONDS.toSeconds(30);


public static final String WR_PREFIX = "writeRequest:"; public static final String WR_PREFIX = "writeRequest:";




+ 1
- 1
bubble-server/src/main/java/bubble/service/upgrade/BubbleJarUpgradeService.java View File

@@ -51,7 +51,7 @@ public class BubbleJarUpgradeService {


public String registerNodeUpgrade(String nodeUuid) { public String registerNodeUpgrade(String nodeUuid) {
final String key = randomAlphanumeric(10) + "." + now(); final String key = randomAlphanumeric(10) + "." + now();
getNodeUpgradeRequests().set(key, nodeUuid, EX, MINUTES.toMillis(1));
getNodeUpgradeRequests().set(key, nodeUuid, EX, MINUTES.toSeconds(1));
return key; return key;
} }




Loading…
Cancel
Save