Export d88010549

.github/workflows/sapling-cli-getdeps_linux.yml

@@ -3,7 +3,12 @@
 name: Sapling CLI Getdeps Linux
 
 on:
-  workflow_dispatch
+  push:
+    branches:
+    - main
+  pull_request:
+    branches:
+    - main
 
 permissions:
   contents: read  #  to fetch code (actions/checkout)

eden/mononoke/tests/integration/server/test-multiplexed-packblob.t

@@ -6,28 +6,22 @@
 
   $ . "${TEST_FIXTURES}/library.sh"
 
-setup configuration
-  $ MULTIPLEXED=1 PACK_BLOB=0 setup_common_config "blob_files"
-  $ cd "$TESTTMP"
-  $ testtool_drawdag -R repo <<'EOF'
-  > C
-  > |
-  > B
-  > |
-  > A
-  > # modify: C "C" pad=10000 "C"
-  > # modify: B "B" pad=10000 "B"
-  > # modify: A "A" pad=10000 "A"
-  > EOF
-  A=b7150acb604b51b1d5786f0f7ea951d8ffe902b7313bdeba9620b2ead15e7d66
-  B=fab9d974bdf31ffcc908fc5375502d4d38467b091144512700bd8b023982ab57
-  C=c2351942da4871c51880dc56e8371474a4f0e82884c62c45581781daede54887
+setup configuration in usual uncompressed way
+  $ MULTIPLEXED=1 PACK_BLOB=0 default_setup_blobimport "blob_files"
+  hg repo
+  o  C [draft;rev=2;26805aba1e60]
+  │
+  o  B [draft;rev=1;112478962961]
+  │
+  o  A [draft;rev=0;426bada5c675]
+  $
+  blobimporting
 
 Check the stores have expected counts
   $ ls blobstore/0/blobs/ | wc -l
-  21
+  33
   $ ls blobstore/1/blobs/ | wc -l
-  21
+  33
 
 Check that the packed sizes are larger due to the packblob wrappers on store 0
   $ PACKED=$(du -s --bytes blobstore/0/blobs/ | cut -f1); UNPACKED=$(du -s --bytes blobstore/1/blobs/ | cut -f1)
@@ -37,38 +31,8 @@ Move the uncompressed packed store aside
   $ mv "$TESTTMP/blobstore/0" "$TESTTMP/blobstore.raw"
   $ rm -rf "$TESTTMP/blobstore_sync_queue/sqlite_dbs" "$TESTTMP/blobstore"
 
-Import again with zstd compression
-  $ MULTIPLEXED=1 PACK_BLOB=1 setup_common_config "blob_files"
-  $ cd "$TESTTMP"
-  $ cat > mononoke-config/common/storage.toml <<EOF
-  > # Start new config
-  > [blobstore.metadata.local]
-  > local_db_path = "$TESTTMP/monsql"
-  > [blobstore.blobstore.multiplexed_wal]
-  > multiplex_id = 1
-  > queue_db = { local = { local_db_path = "$TESTTMP/blobstore_sync_queue" } }
-  > write_quorum = 1
-  > multiplex_scuba_table = "file://$TESTTMP/blobstore_trace_scuba.json"
-  > components = [
-  >   { blobstore_id = 0, blobstore = { pack = { blobstore = { blob_files = { path = "$TESTTMP/blobstore/0" } }, pack_config = { put_format = { ZstdIndividual = { compression_level = 3 } } } } } },
-  >   { blobstore_id = 1, blobstore = { pack = { blobstore = { blob_files = { path = "$TESTTMP/blobstore/1" } }, pack_config = { put_format = { ZstdIndividual = { compression_level = 3 } } } } } },
-  > ]
-  > [blobstore.mutable_blobstore]
-  > blob_files = { path = "$TESTTMP/blobstore/mutable" }
-  > EOF
-  $ testtool_drawdag -R repo <<'EOF'
-  > C
-  > |
-  > B
-  > |
-  > A
-  > # modify: C "C" pad=10000 "C"
-  > # modify: B "B" pad=10000 "B"
-  > # modify: A "A" pad=10000 "A"
-  > EOF
-  A=b7150acb604b51b1d5786f0f7ea951d8ffe902b7313bdeba9620b2ead15e7d66
-  B=fab9d974bdf31ffcc908fc5375502d4d38467b091144512700bd8b023982ab57
-  C=c2351942da4871c51880dc56e8371474a4f0e82884c62c45581781daede54887
+Blobimport again, but this time enable zstd compression
+  $ blobimport repo/.hg repo --blobstore-write-zstd=true --blobstore-write-zstd-level=0
 
 Check that the packed sizes are smaller due to compression
   $ PACKED=$(du -s --bytes blobstore/0/blobs/ | cut -f1); OLDPACKED=$(du -s --bytes blobstore.raw/blobs/ | cut -f1)

eden/mononoke/tests/integration/server/test-server-new-repo.t

@@ -13,15 +13,15 @@ setup configuration
   $ setup_common_config
   $ cd $TESTTMP
 
+setup repo
+  $ testtool_drawdag -R repo <<EOF
+  > A
+  > # bookmark: A master_bookmark
+  > EOF
+  A=aa53d24251ff3f54b1b2c29ae02826701b2abeb0079f1bb13b8434b54cd87675
+
 start mononoke
   $ start_and_wait_for_mononoke_server
-setup repo
-  $ hg clone -q mono:repo repo
-  $ cd repo
-  $ echo "a file content" > a
-  $ hg add a
-  $ hg ci -ma
-  $ hg push -q --to master_bookmark --create
 
 clone from the new repo as well
   $ hg clone -q mono:repo repo-clone
@@ -31,9 +31,9 @@ Push with bookmark
   $ echo withbook > withbook && hg addremove && hg ci -m withbook
   adding withbook
   $ hg push --to withbook --create
-  pushing rev 11f53bbd855a to destination mono:repo bookmark withbook
+  pushing rev cdbb2b8b2cf1 to destination mono:repo bookmark withbook
   searching for changes
   exporting bookmark withbook
   $ hg book --remote
-     remote/master_bookmark           0e7ec5675652a04069cbf976a42e45b740f3243c
-     remote/withbook                  11f53bbd855ac06521a8895bd57e6ce5f46a9980
+     remote/master_bookmark           20ca2a4749a439b459125ef0f6a4f26e88ee7538
+     remote/withbook                  cdbb2b8b2cf1612cd6a1271c96a7a89d98b36dd4