32
32
import org .dcache .pool .FaultEvent ;
33
33
import org .dcache .pool .FaultListener ;
34
34
import org .dcache .pool .classic .MoverRequestScheduler .Order ;
35
+ import org .dcache .pool .classic .MoverRequestScheduler .PrioritizedRequest ;
35
36
import org .dcache .util .IoPriority ;
36
37
import org .slf4j .Logger ;
37
38
import org .slf4j .LoggerFactory ;
@@ -443,24 +444,7 @@ public Serializable call() throws CommandException {
443
444
.toArray (IoJobInfo []::new );
444
445
} else {
445
446
446
- Comparator <MoverRequestScheduler .PrioritizedRequest > comparator ;
447
- if (sortBySize ) {
448
- comparator = (b , a ) -> Long .compare (
449
- a .getMover ().getBytesTransferred (), b .getMover ().getBytesTransferred ()
450
- );
451
- } else if (sortByTime ) {
452
- comparator = (b , a ) -> Long .compare (
453
- a .getMover ().getLastTransferred (), b .getMover ().getLastTransferred ()
454
- );
455
- } else {
456
- comparator = (b , a ) -> Integer .compare (
457
- a .getId (), b .getId ()
458
- );
459
- }
460
-
461
- if (reverseSort ) {
462
- comparator = comparator .reversed ();
463
- }
447
+ Comparator <PrioritizedRequest > comparator = getPrioritizedRequestComparator ();
464
448
465
449
StringBuilder sb = new StringBuilder ();
466
450
if (groupByQueue ) {
@@ -478,6 +462,28 @@ public Serializable call() throws CommandException {
478
462
return sb .toString ();
479
463
}
480
464
}
465
+
466
+ private Comparator <PrioritizedRequest > getPrioritizedRequestComparator () {
467
+ Comparator <PrioritizedRequest > comparator ;
468
+ if (sortBySize ) {
469
+ comparator = (b , a ) -> Long .compare (
470
+ a .getMover ().getBytesTransferred (), b .getMover ().getBytesTransferred ()
471
+ );
472
+ } else if (sortByTime ) {
473
+ comparator = (b , a ) -> Long .compare (
474
+ a .getMover ().getLastTransferred (), b .getMover ().getLastTransferred ()
475
+ );
476
+ } else {
477
+ comparator = (b , a ) -> Integer .compare (
478
+ a .getId (), b .getId ()
479
+ );
480
+ }
481
+
482
+ if (reverseSort ) {
483
+ comparator = comparator .reversed ();
484
+ }
485
+ return comparator ;
486
+ }
481
487
}
482
488
483
489
@ Command (name = "p2p ls" , hint = "list pool to pool source movers" ,
0 commit comments