[ARVADOS] updated: c5eed3ffad31ff92f8399d32c57a710681c79caa

git at public.curoverse.com git at public.curoverse.com
Mon Sep 14 15:23:35 EDT 2015


Summary of changes:
 services/arv-git-httpd/server_test.go              |   4 +-
 services/keepstore/bufferpool_test.go              |   4 +-
 services/keepstore/collision.go                    |  49 ++
 services/keepstore/collision_test.go               |  53 ++
 services/keepstore/handler_test.go                 | 407 ++++++++------
 services/keepstore/handlers.go                     | 236 ++++----
 services/keepstore/keepstore.go                    |  47 +-
 services/keepstore/keepstore_test.go               | 126 ++---
 services/keepstore/logging_router.go               |   4 +
 services/keepstore/mock_mutex_for_test.go          |  23 +
 services/keepstore/perms.go                        |  53 +-
 services/keepstore/perms_test.go                   |  66 +--
 services/keepstore/pull_worker.go                  |  54 +-
 services/keepstore/pull_worker_integration_test.go |   2 +-
 services/keepstore/pull_worker_test.go             | 184 +++---
 services/keepstore/trash_worker.go                 |  14 +-
 services/keepstore/trash_worker_test.go            |  74 +--
 services/keepstore/volume.go                       | 205 ++++++-
 services/keepstore/volume_generic_test.go          | 614 +++++++++++++++++++++
 services/keepstore/volume_test.go                  |  50 +-
 services/keepstore/volume_unix.go                  | 137 +++--
 services/keepstore/volume_unix_test.go             | 475 +++++++---------
 services/keepstore/work_queue.go                   |   2 +
 .../arvnodeman/computenode/driver/azure.py         |   9 +-
 services/nodemanager/setup.py                      |   4 +-
 25 files changed, 1950 insertions(+), 946 deletions(-)
 create mode 100644 services/keepstore/collision.go
 create mode 100644 services/keepstore/collision_test.go
 create mode 100644 services/keepstore/mock_mutex_for_test.go
 create mode 100644 services/keepstore/volume_generic_test.go

       via  c5eed3ffad31ff92f8399d32c57a710681c79caa (commit)
       via  0041395d00cda5ddeb488dae2d9fae7b6b437c9d (commit)
       via  04a40b8028387c4b8899d6b5b0a55d349ddab04b (commit)
       via  63f2191f07851bc66756de518644f2259b938d88 (commit)
       via  0ad0ce519da703b3f13c0ad8a74ea8235b7d90e5 (commit)
       via  a5f4236f9dfc56e7374d108cc595c2aab57e3a0e (commit)
       via  12da8133a90777f2faca72ee2cbba11cc71480e8 (commit)
       via  75e196b201be758ffb857c3f2d33847e8cca0d18 (commit)
       via  b9e48b6cbfff91b05af44cf1410120468a385aba (commit)
       via  8781021a9ab265b225f0f1eaef6170abde9ce3c3 (commit)
       via  143a5f355100b837daa428231df0370b525a1f9f (commit)
       via  8550361e090670395e9f079e7718974b17fc0f5d (commit)
       via  d805ea58fa7f4fce9e457df7073b1b414249d2ed (commit)
       via  241f0bcdacbf83b587bff9ff45985e720bde9f0b (commit)
       via  21047149d6b42845f563a480b5067b9e4b0d895c (commit)
       via  fbeca60ad61f0ef846a026b288a3bc5104383da7 (commit)
       via  9a34f5ed292fb8d2f262e4c23e758cd689d81db7 (commit)
       via  52cca9dc7c50ef8c54c9dc83a2ccf0129c27485e (commit)
       via  7327d3b601a50148abead0ae226176a40937e363 (commit)
       via  c5f81922eff0f35eb2bcf8f9da7b9da1a7f86e90 (commit)
       via  0de159f9e971e89fa13acb75d0c0df193b1319c6 (commit)
       via  5dd88c53ca3357f96bb98ad286d0fb0a52ef5f54 (commit)
       via  d8df6da4433fdd4ba80cb893e976e72f41f62b32 (commit)
       via  3400559165e50e3d62adf6d45f9970a13450d907 (commit)
       via  eeeb4aef6e54d5cd3290bdeba91a8009f3e261bc (commit)
       via  23cc1183e500eb6fa22b611c1c6fc60de1aff9e7 (commit)
       via  e35c34214b2893f329043f2cca7cc0233bac553f (commit)
       via  35b91242eb6bcc002815519afa24effecd8fa6b6 (commit)
       via  856bce1cade4ccfdf821d8ad2d0e0ea22e68b875 (commit)
       via  5f4b7e74af4b85f290ffe396db84a5cab6af08a1 (commit)
       via  025bf2d0e657560202cb428cd2f27f9cfc76111f (commit)
       via  4d2984d9a3c826cd8938166adf402175bb59fef2 (commit)
       via  8cefa5450eb57cfa06f13721228ba1913e7f8c3a (commit)
       via  d2db86b680a87c67fbdd59e372f42505ae8c2d4e (commit)
       via  20abe07b6780abb3a67292af4f4f8ffab988f9ca (commit)
       via  8dd54802b2ada6da4fd6faac6e4fba2e82d2fb11 (commit)
       via  8674798427a9d9e20e1586fe783aa5af6712ebb6 (commit)
       via  7930d7abaabf2fd1f3432eca10f26b821e0ef94f (commit)
       via  a3cda4b279d7446b55caab3a7ca8aef5960204cc (commit)
      from  1082979bc8a783e8f488bcccb5a1797b7d2bfa48 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit c5eed3ffad31ff92f8399d32c57a710681c79caa
Merge: 1082979 0041395
Author: radhika <radhika at curoverse.com>
Date:   Mon Sep 14 15:23:21 2015 -0400

    Merge branch 'master' into 6260-test-datamanager
    
    Conflicts:
    	services/keepstore/keepstore.go

diff --cc services/keepstore/keepstore.go
index 5930357,9c84534..a79a401
--- a/services/keepstore/keepstore.go
+++ b/services/keepstore/keepstore.go
@@@ -26,25 -27,22 +27,26 @@@ import 
  
  // Default TCP address on which to listen for requests.
  // Initialized by the --listen flag.
- const DEFAULT_ADDR = ":25107"
+ const DefaultAddr = ":25107"
  
  // A Keep "block" is 64MB.
- const BLOCKSIZE = 64 * 1024 * 1024
+ const BlockSize = 64 * 1024 * 1024
  
- // A Keep volume must have at least MIN_FREE_KILOBYTES available
+ // A Keep volume must have at least MinFreeKilobytes available
  // in order to permit writes.
- const MIN_FREE_KILOBYTES = BLOCKSIZE / 1024
+ const MinFreeKilobytes = BlockSize / 1024
  
 +// Until #6221 is resolved, never_delete must be true.
- // However, allow it to be false in testing.
++// However, allow it to be false in testing with TEST_DATA_MANAGER_TOKEN
 +const TEST_DATA_MANAGER_TOKEN = "4axaw8zxe0qm22wa6urpp5nskcne8z88cvbupv653y1njyi05h"
 +
- var PROC_MOUNTS = "/proc/mounts"
+ // ProcMounts /proc/mounts
+ var ProcMounts = "/proc/mounts"
  
- // enforce_permissions controls whether permission signatures
+ // enforcePermissions controls whether permission signatures
  // should be enforced (affecting GET and DELETE requests).
  // Initialized by the -enforce-permissions flag.
- var enforce_permissions bool
+ var enforcePermissions bool
  
  // blob_signature_ttl is the time duration for which new permission
  // signatures (returned by PUT requests) will be valid.

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list