megarepo_api: don't derive filenodes while building megarepo commits

Summary:
The filenodes derived data type only applies to public commits.  Ordinarily it is a no-op when attempted on a draft commit, however derivation batching can fail if it discovers that the parent of a batch root is not derived.

Don't even try to derive filenodes for these commits.  The derivation will happen for real when the bookmark is moved to the head commit and the ancestors all become public.

Reviewed By: gustavoavena

Differential Revision: D66507350

fbshipit-source-id: 6c4717469949aee709e7ec0e939596b2596699c1

eden/mononoke/megarepo_api/src/add_sync_target.rs

@@ -10,7 +10,6 @@ use std::sync::Arc;
 
 use bookmarks::BookmarkKey;
 use bookmarks::BookmarksRef;
-use bulk_derivation::BulkDerivation;
 use context::CoreContext;
 use futures::TryFutureExt;
 use megarepo_config::verify_config;
@@ -24,8 +23,8 @@ use mononoke_api::MononokeRepo;
 use mononoke_api::RepoContext;
 use mononoke_types::ChangesetId;
 use mutable_renames::MutableRenames;
-use repo_derived_data::RepoDerivedDataRef;
 
+use crate::common::derive_all_types;
 use crate::common::MegarepoOp;
 
 // Create a new sync target given a config.
@@ -136,30 +135,15 @@ impl<'a, R: MononokeRepo> AddSyncTarget<'a, R> {
 
         // For now let's just retry a few times so that we don't have to start over
         // because of flakiness
-        let mut i = 0;
-        loop {
-            i += 1;
-            let derived_data_types = repo
-                .repo()
-                .repo_derived_data()
-                .active_config()
-                .types
-                .iter()
-                .copied()
-                .collect::<Vec<_>>();
-            let res = repo
-                .repo()
-                .repo_derived_data()
-                .manager()
-                .derive_bulk(ctx, &[top_merge_cs_id], None, &derived_data_types, None)
-                .await;
-            match res {
+        for attempt in 1.. {
+            let result = derive_all_types(ctx, repo.repo(), top_merge_cs_id).await;
+            match result {
                 Ok(()) => {
                     break;
                 }
                 Err(err) => {
                     scuba.log_with_msg("Derived data failed, retrying", Some(format!("{:#}", err)));
-                    if i >= 5 {
+                    if attempt >= 5 {
                         return Err(err.into());
                     }
                 }

eden/mononoke/megarepo_api/src/common.rs

@@ -66,6 +66,7 @@ use mononoke_types::BonsaiChangeset;
 use mononoke_types::BonsaiChangesetMut;
 use mononoke_types::ChangesetId;
 use mononoke_types::DateTime;
+use mononoke_types::DerivableType;
 use mononoke_types::FileChange;
 use mononoke_types::FileType;
 use mononoke_types::GitLfs;
@@ -1426,6 +1427,10 @@ pub(crate) async fn derive_all_types(
         .types
         .iter()
         .copied()
+        .filter(|t| {
+            // Filenodes cannot be derived for draft commits
+            *t != DerivableType::FileNodes
+        })
         .collect::<Vec<_>>();
     repo.repo_derived_data()
         .manager()