Skip to content

Commit 4e51d19

Browse files
mcmilkmcmilk
authored
Update protobuf files from upstream CERN repo (#16)
Signed-off-by: Tino Reichardt <tino.reichardt@desy.de>
1 parent cd08301 commit 4e51d19

3 files changed

Lines changed: 65 additions & 31 deletions

File tree

‎src/main/proto/cta_admin.proto‎

Lines changed: 61 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ message OptionBoolean {
4444
NO_RECALL = 17;
4545
DIRTY_BIT = 18;
4646
IS_REPACK_VO = 19;
47+
MISSING_FILE_COPIES = 20;
4748
}
4849

4950
Key key = 1;
@@ -123,6 +124,7 @@ message OptionString {
123124
WEBCAM_URL = 41;
124125
LIBRARY_LOCATION = 42;
125126
ARCHIVE_ROUTE_TYPE = 43;
127+
DISK_FILE_ID = 44;
126128
}
127129

128130
Key key = 1;
@@ -262,6 +264,7 @@ message AdminLsItem {
262264
cta.common.EntryLog creation_log = 2;
263265
cta.common.EntryLog last_modification_log = 3;
264266
string comment = 4;
267+
string instance_name = 5;
265268
}
266269

267270
message ArchiveFileLsItem {
@@ -288,6 +291,7 @@ message ArchiveRouteLsItem {
288291
cta.common.EntryLog last_modification_log = 5;
289292
string comment = 6;
290293
ArchiveRouteType archive_route_type = 7;
294+
string instance_name = 8;
291295
}
292296

293297
message DriveConfigItem {
@@ -343,6 +347,7 @@ message DriveLsItem {
343347
string physical_library = 28;
344348
bool physical_library_disabled = 29;
345349
string scheduler_backend_name = 30;
350+
string instance_name = 31;
346351
}
347352

348353
message FailedRequestLsItem {
@@ -357,12 +362,16 @@ message FailedRequestLsItem {
357362
repeated string failurelogs = 9;
358363
uint32 totalreportretries = 10;
359364
repeated string reportfailurelogs = 11;
365+
string scheduler_backend_name = 12;
366+
string instance_name = 13;
360367
}
361368

362369
message FailedRequestLsSummary {
363370
RequestType request_type = 1;
364371
uint64 total_files = 2;
365372
uint64 total_size = 3;
373+
string scheduler_backend_name = 4;
374+
string instance_name = 5;
366375
}
367376

368377
message GroupMountRuleLsItem {
@@ -372,13 +381,15 @@ message GroupMountRuleLsItem {
372381
cta.common.EntryLog creation_log = 4;
373382
cta.common.EntryLog last_modification_log = 5;
374383
string comment = 6;
384+
string instance_name = 7;
375385
}
376386

377387
message ListPendingArchivesItem {
378388
cta.common.ArchiveFile af = 1;
379389
cta.common.TapeFile tf = 2;
380390
uint64 copy_nb = 3;
381391
string tapepool = 4;
392+
string instance_name = 5;
382393
}
383394

384395
message ListPendingArchivesSummary {
@@ -407,6 +418,7 @@ message LogicalLibraryLsItem {
407418
string comment = 5;
408419
string disabled_reason = 6;
409420
string physical_library = 7;
421+
string instance_name = 8;
410422
}
411423

412424
message PhysicalLibraryLsItem {
@@ -425,6 +437,7 @@ message PhysicalLibraryLsItem {
425437
cta.common.EntryLog last_modification_log = 13;
426438
bool is_disabled = 14;
427439
string disabled_reason = 15;
440+
string instance_name = 16;
428441
}
429442

430443
message MediaTypeLsItem {
@@ -439,6 +452,7 @@ message MediaTypeLsItem {
439452
string comment = 9;
440453
cta.common.EntryLog creation_log = 10;
441454
cta.common.EntryLog last_modification_log = 11;
455+
string instance_name = 12;
442456
}
443457

444458
message MountPolicyLsItem {
@@ -450,6 +464,7 @@ message MountPolicyLsItem {
450464
cta.common.EntryLog creation_log = 7;
451465
cta.common.EntryLog last_modification_log = 8;
452466
string comment = 9;
467+
string instance_name = 10;
453468
}
454469

455470
message RepackDestinationInfos{
@@ -487,6 +502,8 @@ message RepackLsItem {
487502
uint64 total_files_on_tape_at_start = 26;
488503
uint64 total_bytes_on_tape_at_start = 27;
489504
bool all_files_selected_at_start = 28;
505+
string instance_name = 29;
506+
string scheduler_backend_name = 30;
490507
}
491508

492509
message RequesterMountRuleLsItem {
@@ -496,6 +513,7 @@ message RequesterMountRuleLsItem {
496513
cta.common.EntryLog creation_log = 4;
497514
cta.common.EntryLog last_modification_log = 5;
498515
string comment = 6;
516+
string instance_name = 7;
499517
}
500518

501519
message ShowQueuesItem {
@@ -532,6 +550,8 @@ message ShowQueuesItem {
532550
uint64 youngest_age = 31;
533551
string highest_priority_mount_policy = 32;
534552
string lowest_request_age_mount_policy = 33;
553+
string scheduler_backend_name = 34;
554+
string instance_name = 35;
535555
}
536556

537557
message StorageClassLsItem {
@@ -541,6 +561,7 @@ message StorageClassLsItem {
541561
cta.common.EntryLog creation_log = 4;
542562
cta.common.EntryLog last_modification_log = 5;
543563
string comment = 6;
564+
string instance_name = 7;
544565
}
545566

546567
message TapeLsItem {
@@ -582,6 +603,7 @@ message TapeLsItem {
582603
string purchase_order = 31;
583604
string physical_library = 32;
584605
LabelFormat label_format = 33;
606+
string instance_name = 34;
585607
}
586608

587609
message Checksum {
@@ -613,6 +635,7 @@ message TapeFileLsItem {
613635
ArchiveFile af = 1;
614636
DiskFile df = 2;
615637
TapeFile tf = 3;
638+
string instance_name = 4;
616639
}
617640

618641
message TapePoolLsItem {
@@ -624,12 +647,14 @@ message TapePoolLsItem {
624647
uint64 capacity_bytes = 6;
625648
uint64 data_bytes = 7;
626649
bool encrypt = 8;
627-
string supply = 9;
650+
// 9 supply is DEPRECATED ;
628651
cta.common.EntryLog created = 10;
629652
cta.common.EntryLog modified = 11;
630653
string comment = 12;
631654
repeated string supply_source = 13;
632655
repeated string supply_destination = 14;
656+
string encryption_key_name = 15;
657+
string instance_name = 16;
633658
}
634659

635660
message DiskSystemLsItem {
@@ -642,13 +667,15 @@ message DiskSystemLsItem {
642667
string comment = 8;
643668
string disk_instance = 10;
644669
string disk_instance_space = 11;
670+
string instance_name = 12;
645671
}
646672

647673
message DiskInstanceLsItem {
648674
string name = 1;
649675
string comment = 2;
650676
cta.common.EntryLog creation_log = 3;
651-
cta.common.EntryLog last_modification_log = 4;
677+
cta.common.EntryLog last_modification_log = 4;
678+
string instance_name = 5;
652679
}
653680

654681
message DiskInstanceSpaceLsItem {
@@ -660,7 +687,8 @@ message DiskInstanceSpaceLsItem {
660687
uint64 free_space = 6;
661688
uint64 last_refresh_time = 7;
662689
cta.common.EntryLog creation_log = 8;
663-
cta.common.EntryLog last_modification_log = 9;
690+
cta.common.EntryLog last_modification_log = 9;
691+
string instance_name = 10;
664692
}
665693

666694
message VirtualOrganizationLsItem {
@@ -673,6 +701,7 @@ message VirtualOrganizationLsItem {
673701
uint64 max_file_size = 7;
674702
string diskinstance = 8;
675703
bool is_repack_vo = 9;
704+
string instance_name = 10;
676705
}
677706

678707
message Version{
@@ -681,36 +710,38 @@ message Version{
681710
}
682711

683712
message VersionItem {
684-
Version client_version = 1;
685-
Version server_version = 2;
713+
Version client_version = 1;
714+
Version server_version = 2;
686715
string catalogue_connection_string = 3;
687-
string catalogue_version = 4;
688-
bool is_upgrading = 5;
689-
string scheduler_backend_name = 6;
716+
string catalogue_version = 4;
717+
bool is_upgrading = 5;
718+
string scheduler_backend_name = 6;
719+
string instance_name = 7;
690720
}
691721

692722
message RecycleTapeFileLsItem {
693-
string vid = 1;
694-
uint64 fseq = 2;
695-
uint64 block_id = 3;
696-
uint32 copy_nb = 4;
697-
uint64 tape_file_creation_time = 5;
698-
uint64 archive_file_id = 6;
699-
string disk_instance = 7;
700-
string disk_file_id = 8;
701-
string disk_file_id_when_deleted = 9;
702-
uint64 disk_file_uid = 10;
703-
uint64 disk_file_gid = 11;
704-
uint64 size_in_bytes = 12;
705-
repeated Checksum checksum = 13;
706-
string storage_class = 14;
707-
uint64 archive_file_creation_time = 15;
708-
uint64 reconciliation_time = 16;
709-
string collocation_hint = 17;
710-
string disk_file_path = 18;
711-
string reason_log = 19;
712-
uint64 recycle_log_time = 20;
713-
string virtual_organization = 21;
723+
string vid = 1;
724+
uint64 fseq = 2;
725+
uint64 block_id = 3;
726+
uint32 copy_nb = 4;
727+
uint64 tape_file_creation_time = 5;
728+
uint64 archive_file_id = 6;
729+
string disk_instance = 7;
730+
string disk_file_id = 8;
731+
string disk_file_id_when_deleted = 9;
732+
uint64 disk_file_uid = 10;
733+
uint64 disk_file_gid = 11;
734+
uint64 size_in_bytes = 12;
735+
repeated Checksum checksum = 13;
736+
string storage_class = 14;
737+
uint64 archive_file_creation_time = 15;
738+
uint64 reconciliation_time = 16;
739+
string collocation_hint = 17;
740+
string disk_file_path = 18;
741+
string reason_log = 19;
742+
uint64 recycle_log_time = 20;
743+
string virtual_organization = 21;
744+
string instance_name = 22;
714745
}
715746

716747
message ActivityMountRuleLsItem {
@@ -721,4 +752,5 @@ message ActivityMountRuleLsItem {
721752
cta.common.EntryLog creation_log = 5;
722753
cta.common.EntryLog last_modification_log = 6;
723754
string comment = 7;
755+
string instance_name = 8;
724756
}

‎src/main/proto/cta_eos.proto‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ message Metadata {
7070
cta.common.Clock btime = 5; //< birth time (NOT USED BY CTA)
7171
cta.common.Clock ttime = 6; //< tree modification time (NOT USED BY CTA)
7272
cta.common.OwnerId owner = 7; //< ownership
73-
uint64 size = 8; //< size
73+
uint64 size = 8; //< size
7474
sint32 mode = 10; //< mode (NOT USED BY CTA)
7575
string lpath = 11; //< logical path
7676
map<string, string> xattr = 12; //< xattribute map
@@ -82,7 +82,7 @@ message Metadata {
8282
uint64 archive_file_id = 15; //< CTA Archive File ID
8383
string storage_class = 16; //< CTA Storage Class
8484
string request_objectstore_id = 999; //< Address of a queued Request in the objectstore, used
85-
// to cancel a previous archive or retrieve request
85+
// to cancel a previous archive or retrieve request
8686
};
8787

8888
message Notification {

‎src/main/proto/cta_frontend.proto‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,8 @@ service CtaRpc {
166166

167167
service CtaRpcStream {
168168
rpc TapeLs (cta.xrd.Request) returns (stream StreamResponse) {}
169+
// common method for all the streaming admin commands
170+
rpc GenericAdminStream (cta.xrd.Request) returns (stream StreamResponse) {}
169171
}
170172

171173
service Negotiation {

0 commit comments

Comments
 (0)