Skip to content

Commit ed84e68

Browse files
authored
Merge pull request #8888 from tangledbytes/utkarsh/feat/lifecycle/abort-incomplete-multipart-uploads
Enhance Lifecycle support
2 parents 2ae6118 + 8e02dfb commit ed84e68

File tree

10 files changed

+854
-104
lines changed

10 files changed

+854
-104
lines changed

src/api/object_api.js

Lines changed: 124 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1424,6 +1424,130 @@ module.exports = {
14241424
auth: { system: ['admin', 'user'] }
14251425
},
14261426

1427+
delete_incomplete_multiparts: {
1428+
method: 'DELETE',
1429+
params: {
1430+
type: 'object',
1431+
required: [
1432+
'bucket',
1433+
'days_after_initiation',
1434+
],
1435+
properties: {
1436+
bucket: { $ref: 'common_api#/definitions/bucket_name' },
1437+
days_after_initiation: {
1438+
type: 'integer',
1439+
},
1440+
prefix: {
1441+
type: 'string',
1442+
},
1443+
size_less: {
1444+
type: 'integer'
1445+
},
1446+
size_greater: {
1447+
type: 'integer'
1448+
},
1449+
limit: {
1450+
type: 'integer'
1451+
},
1452+
reply_objects: {
1453+
type: 'boolean'
1454+
}
1455+
},
1456+
},
1457+
reply: {
1458+
type: 'object',
1459+
properties: {
1460+
num_objects_deleted: {
1461+
type: 'integer'
1462+
}
1463+
}
1464+
},
1465+
auth: { system: ['admin', 'user'] }
1466+
},
1467+
1468+
delete_noncurrent_versions: {
1469+
method: 'DELETE',
1470+
params: {
1471+
type: 'object',
1472+
required: [
1473+
'bucket',
1474+
'noncurrent_days'
1475+
],
1476+
properties: {
1477+
bucket: { $ref: 'common_api#/definitions/bucket_name' },
1478+
noncurrent_days: {
1479+
type: 'integer',
1480+
},
1481+
newer_noncurrent_versions: {
1482+
type: 'integer',
1483+
},
1484+
prefix: {
1485+
type: 'string',
1486+
},
1487+
size_less: {
1488+
type: 'integer'
1489+
},
1490+
size_greater: {
1491+
type: 'integer'
1492+
},
1493+
tags: {
1494+
$ref: 'common_api#/definitions/tagging'
1495+
},
1496+
limit: {
1497+
type: 'integer'
1498+
},
1499+
reply_objects: {
1500+
type: 'boolean'
1501+
}
1502+
},
1503+
},
1504+
reply: {
1505+
type: 'object',
1506+
properties: {
1507+
num_objects_deleted: {
1508+
type: 'integer'
1509+
}
1510+
}
1511+
},
1512+
auth: { system: ['admin', 'user'] }
1513+
},
1514+
1515+
delete_expired_delete_markers: {
1516+
method: 'DELETE',
1517+
params: {
1518+
type: 'object',
1519+
required: [
1520+
'bucket',
1521+
],
1522+
properties: {
1523+
bucket: { $ref: 'common_api#/definitions/bucket_name' },
1524+
prefix: {
1525+
type: 'string',
1526+
},
1527+
size_less: {
1528+
type: 'integer'
1529+
},
1530+
size_greater: {
1531+
type: 'integer'
1532+
},
1533+
limit: {
1534+
type: 'integer'
1535+
},
1536+
reply_objects: {
1537+
type: 'boolean'
1538+
}
1539+
},
1540+
},
1541+
reply: {
1542+
type: 'object',
1543+
properties: {
1544+
num_objects_deleted: {
1545+
type: 'integer'
1546+
}
1547+
}
1548+
},
1549+
auth: { system: ['admin', 'user'] }
1550+
},
14271551
},
14281552

14291553
definitions: {

src/deploy/NVA_build/standalone_deploy.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,9 @@ function main() {
7373
mkdir -p storage/backingstores/drive1
7474
execute "npm -- run backingstore storage/backingstores/drive1 --port 9991" backingstore1.log
7575
sleep 30
76+
77+
# Wait if stdin is attached
78+
if [ -t 0 ]; then wait; fi
7679
}
7780

7881
main

src/sdk/nb.d.ts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -737,6 +737,11 @@ interface DBSequence {
737737
nextsequence(): Promise<number>;
738738
}
739739

740+
interface sqlResult<T> {
741+
rows: T[],
742+
rowCount: number | null,
743+
}
744+
740745
interface DBCollection {
741746
find(query?: object, options?: object): Promise<DBDoc[]>;
742747
findOne(query?: object, options?: object): Promise<DBDoc>;
@@ -761,6 +766,9 @@ interface DBCollection {
761766
stats(): Promise<mongodb.CollStats>;
762767

763768
validate(doc: object, warn?: 'warn'): object;
769+
770+
executeSQL<T>(query: string, params: Array<any>, options?: { query_name?: string }): Promise<sqlResult<T>>;
771+
name: any;
764772
}
765773

766774
type DBDoc = any;

0 commit comments

Comments
 (0)